Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #110

Merged
merged 9 commits into from
Jul 15, 2024
Merged

Develop #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fbf570f
Resource meraki_networks_wireless_rf_profiles error when trying to cr…
fmunozmiranda Jul 10, 2024
9be383e
- meraki_networks panics on creation if the organization id is invali…
fmunozmiranda Jul 10, 2024
1f15178
resource meraki_networks_appliance_traffic_shaping_uplink_selection e…
fmunozmiranda Jul 10, 2024
dcb4179
- meraki_networks_switch_stacks_routing_interfaces - additional value…
fmunozmiranda Jul 10, 2024
aa01389
meraki_networks_switch_stacks_routing_static_routes - additional fiel…
fmunozmiranda Jul 10, 2024
b97bbca
- unable to create meraki_networks_appliance_vlans with reserved_ip_r…
fmunozmiranda Jul 11, 2024
8043214
Testing of issue #107
fmunozmiranda Jul 11, 2024
ffce2af
meraki_networks_firmware_upgrades throws error when products set
fmunozmiranda Jul 11, 2024
651f012
## 0.2.6-alpha (July 15, 2024)
fmunozmiranda Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
## 0.2.6-alpha (July 15, 2024)
BUGFIXES:
* Issue #88 fixed.
* Issue #89 fixed.
* Issue #92 fixed.
* Issue #93 fixed.
* Issue #94 fixed.
* Issue #96 fixed.
* Issue #97 fixed.
* Issue #98 fixed.
* Issue #99 fixed.
* Issue #100 fixed.
* Issue #101 fixed.
* Issue #107 fixed.
* Issue #108 fixed.
* Issue #109 fixed.

## 0.2.5-alpha (June 28, 2024)
BUGFIXES:
* resource meraki_networks_appliance_firewall_l3_firewall_rules this_rule - rules issues for empty ruleset and syslog_default_rule #76.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ HOSTNAME=hashicorp.com
NAMESPACE=edu
NAME=meraki
BINARY=terraform-provider-${NAME}
VERSION=0.2.5-alpha
VERSION=0.2.6-alpha
OS_ARCH=darwin_arm64
# OS_ARCH=darwin_amd64
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ terraform {
required_providers {
meraki = {
source = "cisco-open/meraki"
version = "0.2.5-alpha"
version = "0.2.6-alpha"
}
}
}
Expand Down Expand Up @@ -68,7 +68,7 @@ terraform {
required_providers {
meraki = {
source = "hashicorp.com/edu/meraki"
version = "0.2.5-alpha"
version = "0.2.6-alpha"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/resources/meraki_networks_wireless_ssids_identity_psks/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

resource "meraki_networks_wireless_ssids_identity_psks" "example" {

expires_at = "2018-02-11T00:00:00.090210Z"
expires_at = "2018-02-11T00:00:00.090209Z"
group_policy_id = "101"
name = "Sample Identity PSK"
network_id = "string"
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/data_sources/meraki_administered_identities_me copy/data_source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/data_sources/meraki_administered_identities_me/data_source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/data_sources/meraki_devices/data_source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
22 changes: 22 additions & 0 deletions examples/samples/data_sources/meraki_devices_management_interface/data-source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-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"
}


data "meraki_devices_management_interface" "example" {

serial = "QBSB-BNH2-KDXJ"
}

output "meraki_devices_management_interface_example" {
value = data.meraki_devices_management_interface.example.item
}
2 changes: 1 addition & 1 deletion examples/samples/data_sources/meraki_networks/data_source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/data_sources/meraki_organizations/data_source.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/adaptative_policy_groups/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
4 changes: 2 additions & 2 deletions examples/samples/resources/devices/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand All @@ -18,7 +18,7 @@ terraform {

resource "meraki_devices" "example" {

name = "new name 5"
name = "new name 6"
# floor_plan_id = "string"
# lat = 1.0
# lng = 1.0
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/gnerate_snapshot/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_devices_appliance_uplinks_settings/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_devices_management_interface/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-alpha"
source = "hashicorp.com/edu/meraki"
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_devices_switch_routing_interfaces_dhcp/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_devices_switch_routing_static_routes/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_alerts_settings/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_alerts_settings_2/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_alerts_settings_3/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_appliance_content_filtering/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/samples/resources/meraki_networks_appliance_firewall_inbound_firewall_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_appliance_firewall_l3_firewall_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_appliance_firewall_l7_firewall_rules3/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion ...es/samples/resources/meraki_networks_appliance_firewall_one_to_many_nat_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion ...les/samples/resources/meraki_networks_appliance_firewall_one_to_one_nat_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion ...es/samples/resources/meraki_networks_appliance_firewall_port_forwarding_rules/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.5-alpha"
version = "0.2.6-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
}
Expand Down
2 changes: 1 addition & 1 deletion examples/samples/resources/meraki_networks_appliance_security_intrusion/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
meraki = {
source = "hashicorp.com/edu/meraki"
version = "0.2.5-alpha"
version = "0.2.6-alpha"
}
}

Expand Down
31 changes: 31 additions & 0 deletions ...esources/meraki_networks_appliance_traffic_shaping_custom_performance_classes/resource.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
terraform {
required_providers {
meraki = {
source = "hashicorp.com/edu/meraki"
version = "0.2.6-alpha"
}
}

required_version = ">= 1.2.0"
}

provider "meraki" {
meraki_debug = "true"
}


resource "meraki_networks_appliance_traffic_shaping_custom_performance_classes" "example" {

network_id = "L_828099381482775486"
parameters = {

max_jitter = 100
max_latency = 100
max_loss_percentage = 5
name = "myCustomPerformanceClass"
}
}

output "meraki_networks_appliance_traffic_shaping_custom_performance_classes_example" {
value = meraki_networks_appliance_traffic_shaping_custom_performance_classes.example
}
1 change: 1 addition & 0 deletions examples/samples/resources/meraki_networks_appliance_traffic_shaping_rules/import.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
terraform import meraki_networks_appliance_traffic_shaping_rules.example "network_id"
Loading
Loading