Skip to content

Commit

Permalink
Merge pull request #44 from cisco-open/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
obrigg authored May 22, 2024
2 parents 1400300 + 7d9c21b commit 9b712fa
Show file tree
Hide file tree
Showing 42 changed files with 375 additions and 170 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.2.1-alpha (April 16, 2024)
BUGFIXES:
* ListAttribute replaced to SetAtrribute.
* NetworksWirelessSSIDsResource attributte marked as `Computed` removed cause were only `Optional` params.

## 0.2.0-alpha (April 16, 2024)
FEATURES:
* Provider supports v1.44.1 of Meraki Dashboard API.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

resource "meraki_networks_wireless_ssids_firewall_l3_firewall_rules" "example" {

allow_lan_access = true
allow_lan_access = false
network_id = "string"
number = "string"
rules = [{
Expand Down
20 changes: 20 additions & 0 deletions examples/samples/resources/adaptative_policy_groups/resource.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
terraform {
required_providers {
meraki = {
version = "0.2.0-alpha"
source = "hashicorp.com/edu/meraki"
# "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
}
}
}

provider "meraki" {
meraki_debug = "true"
}

resource "meraki_organizations_adaptive_policy_groups" "repro" {
organization_id = "828099381482762270"
description = "A repro"
name = "pulumi testing 2"
sgt = 1006
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
terraform {
required_providers {
meraki = {
version = "0.2.0-alpha"
source = "hashicorp.com/edu/meraki"
# "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
}
}
}
provider "meraki" {
meraki_debug = "true"
}

variable "my_network_id" {
type = string
default = "*******" # Branch-1234
}
resource "meraki_networks_appliance_vlans" "my_mx" {
appliance_ip = "192.168.14.2"
id = "14"
name = "My VLAN"
network_id = var.my_network_id
subnet = "192.168.14.0/24"
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resource "meraki_networks_syslog_servers" "example" {
network_id = "L_828099381482775375"
servers = [{

host = "1.2.3.4"
host = "1.2.3.42"
port = 443
roles = ["Wireless event log", "URLs"]
}]
Expand Down
Empty file.
27 changes: 15 additions & 12 deletions examples/samples/resources/new/resource.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ terraform {
required_providers {
meraki = {
version = "0.2.0-alpha"
source = "hashicorp.com/edu/meraki"
source = "hashicorp.com/edu/meraki"
# "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
}
}
}

provider "meraki" {
meraki_debug = "true"
}

variable "my_network_id" {
type = string
default = "*******" # Branch-1234
}
resource "meraki_networks_appliance_vlans" "my_mx" {
appliance_ip = "192.168.14.2"
id = "14"
name = "My VLAN"
network_id = var.my_network_id
subnet = "192.168.14.0/24"
}
resource "meraki_networks_alerts_settings" "example" {
network_id = "L_828099381482775374"
alerts = [{
type = "ampMalwareDetected"
enabled = true
}]
default_destinations = {
all_admins = true
# emails = []
http_server_ids = ["aHR0cHM6Ly93ZWJob29rLnNpdGU="]
snmp = false
}
}
53 changes: 53 additions & 0 deletions examples/samples/resources/testing/resource.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
terraform {
required_providers {
meraki = {
version = "0.2.0-alpha"
source = "hashicorp.com/edu/meraki"
}
}
}



provider "meraki" {
meraki_debug = "true"
}

resource "meraki_networks_group_policies" "group_policy_byod" {
name = "BYOD"
network_id = "L_828099381482771185"
vlan_tagging = {
settings = "custom"
vlan_id = "20"
}
}

resource "meraki_networks_group_policies" "group_policy_guest" {
depends_on = [ meraki_networks_group_policies.group_policy_byod ]
name = "GUEST"
network_id = "L_828099381482771185"
vlan_tagging = {
settings = "custom"
vlan_id = "30"
}
}

resource "meraki_networks_group_policies" "group_policy_pan" {
depends_on = [ meraki_networks_group_policies.group_policy_guest ]
name = "PAN"
network_id = "L_828099381482771185"
vlan_tagging = {
settings = "custom"
vlan_id = "15"
}
}

resource "meraki_networks_group_policies" "group_policy_internal" {
depends_on = [ meraki_networks_group_policies.group_policy_pan ]
name = "INTERNAL 2"
network_id = "L_828099381482771185"
vlan_tagging = {
settings = "custom"
vlan_id = "5"
}
}
31 changes: 31 additions & 0 deletions examples/samples/resources/wireless_ssids/resource.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
terraform {
required_providers {
meraki = {
version = "0.2.0-alpha"
source = "hashicorp.com/edu/meraki"
# "hashicorp.com/edu/meraki" is the local built source, change to "cisco-en-programmability/meraki" to use downloaded version from registry
}
}
}

provider "meraki" {
meraki_debug = "true"
}

resource "meraki_networks_wireless_ssids" "test" {
network_id = "L_828099381482771185"
number = 1
enabled = true
name = "test 2"
adult_content_filtering_enabled = false
auth_mode = "psk"
available_on_all_aps = true
band_selection = "Dual band operation with Band Steering"
ip_assignment_mode = "Bridge mode"
psk = "<redacted>"
encryption_mode = "wpa"
wpa_encryption_mode = "WPA2 only"
mandatory_dhcp_enabled = true
default_vlan_id = "10"
lan_isolation_enabled = false
}
27 changes: 15 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ go 1.21.5
toolchain go1.21.6

require (
github.com/hashicorp/terraform-plugin-docs v0.18.0
github.com/hashicorp/terraform-plugin-docs v0.19.1
github.com/hashicorp/terraform-plugin-framework v1.7.0
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
github.com/meraki/dashboard-api-go/v3 v3.0.0
github.com/meraki/dashboard-api-go/v3 v3.0.1
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/go-resty/resty/v2 v2.12.0
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
Expand All @@ -31,10 +31,10 @@ require (
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/hashicorp/hc-install v0.6.2 // indirect
github.com/hashicorp/hc-install v0.6.4 // indirect
github.com/hashicorp/terraform-exec v0.20.0 // indirect
github.com/hashicorp/terraform-json v0.21.0 // indirect
github.com/hashicorp/terraform-plugin-go v0.22.1
github.com/hashicorp/terraform-plugin-go v0.22.2
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
Expand All @@ -47,32 +47,35 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/posener/complete v1.2.3 // indirect
github.com/russross/blackfriday v1.6.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
github.com/zclconf/go-cty v1.14.4 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/grpc v1.63.2 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)

require (
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/cli v1.1.6 // indirect
github.com/juju/ratelimit v1.0.2 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/yuin/goldmark v1.6.0 // indirect
github.com/yuin/goldmark v1.7.0 // indirect
github.com/yuin/goldmark-meta v1.1.0 // indirect
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 9b712fa

Please sign in to comment.