Skip to content

Commit

Permalink
Merge pull request #112 from cisco-open/develop
Browse files Browse the repository at this point in the history
## 0.2.7-alpha (July 16, 2024)
  • Loading branch information
obrigg authored Jul 16, 2024
2 parents 4e9095b + fc8a370 commit 59d293c
Show file tree
Hide file tree
Showing 84 changed files with 153 additions and 132 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.2.7-alpha (July 16, 2024)
* meraki_devices_management_interface error on import state #109.
* Encountering panic in latest version when attempting to create meraki_networks (Resource) #111. Solved in utils file.

## 0.2.6-alpha (July 15, 2024)
BUGFIXES:
* Issue #88 fixed.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
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.6-alpha
VERSION=0.2.7-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
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.6-alpha"
version = "0.2.7-alpha"
}
}
}
Expand Down Expand Up @@ -68,7 +68,7 @@ terraform {
required_providers {
meraki = {
source = "hashicorp.com/edu/meraki"
version = "0.2.6-alpha"
version = "0.2.7-alpha"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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/devices/resource.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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/gnerate_snapshot/resource.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-alpha"
source = "hashicorp.com/edu/meraki"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
12 changes: 5 additions & 7 deletions examples/samples/resources/meraki_networks/resource.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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 @@ -11,14 +11,12 @@ provider "meraki" {
meraki_debug = "true"
}

resource "meraki_networks" "example" {

resource meraki_networks "example" {
name = "My Test Network"
organization_id = "828099381482762270"
name = "TEST_TERRAFORM2"
product_types = ["appliance", "switch", "wireless"]
# , "switch", "wireless"
notes = "This is a test network created by my team"
product_types = ["appliance", "switch", "wireless", "cellularGateway"]
time_zone = "America/Los_Angeles"
notes = "Additional description of the network2"
}
output "meraki_networks_example" {
value = resource.meraki_networks.example
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
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.6-alpha"
version = "0.2.7-alpha"
}
}

Expand Down
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.6-alpha"
version = "0.2.7-alpha"
}
}

Expand Down
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.6-alpha"
version = "0.2.7-alpha"
}
}

Expand Down
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.6-alpha"
version = "0.2.7-alpha"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
meraki = {
version = "0.2.6-alpha"
version = "0.2.7-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
Loading

0 comments on commit 59d293c

Please sign in to comment.