Fix import operation of nested resources

CiscoDevNet · Jan 22, 2024 · 2c9d8d2 · 2c9d8d2
1 parent 4f88170
commit 2c9d8d2
Show file tree

Hide file tree

Showing 31 changed files with 131 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.11 (unreleased)
+
+- Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+
 ## 0.1.10
 
 - Retry on 400 and 500 HTTP errors when creating or updating objects

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.1.11 (unreleased)
+
+- Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+
 ## 0.1.10
 
 - Retry on 400 and 500 HTTP errors when creating or updating objects

diff --git a/docs/resources/device_admin_authentication_rule.md b/docs/resources/device_admin_authentication_rule.md
@@ -113,5 +113,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/docs/resources/device_admin_authorization_exception_rule.md b/docs/resources/device_admin_authorization_exception_rule.md
@@ -106,5 +106,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/docs/resources/device_admin_authorization_rule.md b/docs/resources/device_admin_authorization_rule.md
@@ -106,5 +106,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_device_admin_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/docs/resources/network_access_authentication_rule.md b/docs/resources/network_access_authentication_rule.md
@@ -113,5 +113,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/docs/resources/network_access_authorization_exception_rule.md b/docs/resources/network_access_authorization_exception_rule.md
@@ -106,5 +106,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_network_access_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/docs/resources/network_access_authorization_rule.md b/docs/resources/network_access_authorization_rule.md
@@ -106,5 +106,5 @@ Optional:
 Import is supported using the following syntax:
 
 ```shell
-terraform import ise_network_access_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
 ```
diff --git a/examples/resources/ise_device_admin_authentication_rule/import.sh b/examples/resources/ise_device_admin_authentication_rule/import.sh
@@ -1 +1 @@
-terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/examples/resources/ise_device_admin_authorization_exception_rule/import.sh b/examples/resources/ise_device_admin_authorization_exception_rule/import.sh
@@ -1 +1 @@
-terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/examples/resources/ise_device_admin_authorization_rule/import.sh b/examples/resources/ise_device_admin_authorization_rule/import.sh
@@ -1 +1 @@
-terraform import ise_device_admin_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_device_admin_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/examples/resources/ise_network_access_authentication_rule/import.sh b/examples/resources/ise_network_access_authentication_rule/import.sh
@@ -1 +1 @@
-terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/examples/resources/ise_network_access_authorization_exception_rule/import.sh b/examples/resources/ise_network_access_authorization_exception_rule/import.sh
@@ -1 +1 @@
-terraform import ise_network_access_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/examples/resources/ise_network_access_authorization_rule/import.sh b/examples/resources/ise_network_access_authorization_rule/import.sh
@@ -1 +1 @@
-terraform import ise_network_access_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
+terraform import ise_network_access_authorization_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
diff --git a/gen/generator.go b/gen/generator.go
@@ -220,6 +220,24 @@ func HasReference(attributes []YamlConfigAttribute) bool {
 	return false
 }
 
+// Templating helper function to return number of import parts
+func ImportParts(attributes []YamlConfigAttribute) int {
+	parts := 1
+	for _, attr := range attributes {
+		if attr.Reference {
+			parts += 1
+		} else if attr.Id {
+			parts += 1
+		}
+	}
+	return parts
+}
+
+// Templating helper function to subtract one number from another
+func Subtract(a, b int) int {
+	return a - b
+}
+
 // Templating helper function to return true if ERS API endpoint
 func IsErs(endpoint string) bool {
 	if strings.HasPrefix(endpoint, "/ers") {
@@ -238,6 +256,8 @@ var functions = template.FuncMap{
 	"path":         BuildPath,
 	"hasId":        HasId,
 	"hasReference": HasReference,
+	"importParts":  ImportParts,
+	"subtract":     Subtract,
 	"isErs":        IsErs,
 }
 

diff --git a/gen/templates/import.sh b/gen/templates/import.sh
@@ -1 +1 @@
-terraform import ise_{{snakeCase .Name}}.example "{{$id := false}}{{range .Attributes}}{{if .Id}}{{$id = true}}{{.Example}}{{end}}{{end}}{{if not $id}}76d24097-41c4-4558-a4d0-a8c07ac08470{{end}}"
+terraform import ise_{{snakeCase .Name}}.example "{{$id := false}}{{range .Attributes}}{{if .Id}}{{$id = true}}{{.Example}}{{end}}{{end}}{{if not $id}}{{range .Attributes}}{{if .Reference}}76d24097-41c4-4558-a4d0-a8c07ac08470,{{end}}{{end}}76d24097-41c4-4558-a4d0-a8c07ac08470{{end}}"
diff --git a/gen/templates/model.go b/gen/templates/model.go
diff --git a/gen/templates/resource.go b/gen/templates/resource.go
diff --git a/internal/provider/model_ise_device_admin_authentication_rule.go b/internal/provider/model_ise_device_admin_authentication_rule.go
diff --git a/internal/provider/model_ise_device_admin_authorization_exception_rule.go b/internal/provider/model_ise_device_admin_authorization_exception_rule.go
diff --git a/internal/provider/model_ise_device_admin_authorization_rule.go b/internal/provider/model_ise_device_admin_authorization_rule.go
diff --git a/internal/provider/model_ise_network_access_authentication_rule.go b/internal/provider/model_ise_network_access_authentication_rule.go
diff --git a/internal/provider/model_ise_network_access_authorization_exception_rule.go b/internal/provider/model_ise_network_access_authorization_exception_rule.go
diff --git a/internal/provider/model_ise_network_access_authorization_rule.go b/internal/provider/model_ise_network_access_authorization_rule.go
diff --git a/internal/provider/resource_ise_device_admin_authentication_rule.go b/internal/provider/resource_ise_device_admin_authentication_rule.go
diff --git a/internal/provider/resource_ise_device_admin_authorization_exception_rule.go b/internal/provider/resource_ise_device_admin_authorization_exception_rule.go
diff --git a/internal/provider/resource_ise_device_admin_authorization_rule.go b/internal/provider/resource_ise_device_admin_authorization_rule.go
diff --git a/internal/provider/resource_ise_network_access_authentication_rule.go b/internal/provider/resource_ise_network_access_authentication_rule.go
diff --git a/internal/provider/resource_ise_network_access_authorization_exception_rule.go b/internal/provider/resource_ise_network_access_authorization_exception_rule.go
diff --git a/internal/provider/resource_ise_network_access_authorization_rule.go b/internal/provider/resource_ise_network_access_authorization_rule.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.1.11 (unreleased)
+
+- Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+
 ## 0.1.10
 
 - Retry on 400 and 500 HTTP errors when creating or updating objects
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
		terraform import ise_device_admin_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
		terraform import ise_device_admin_authorization_exception_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470"
		terraform import ise_network_access_authentication_rule.example "76d24097-41c4-4558-a4d0-a8c07ac08470,76d24097-41c4-4558-a4d0-a8c07ac08470"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		terraform import ise_{{snakeCase .Name}}.example "{{$id := false}}{{range .Attributes}}{{if .Id}}{{$id = true}}{{.Example}}{{end}}{{end}}{{if not $id}}76d24097-41c4-4558-a4d0-a8c07ac08470{{end}}"
		terraform import ise_{{snakeCase .Name}}.example "{{$id := false}}{{range .Attributes}}{{if .Id}}{{$id = true}}{{.Example}}{{end}}{{end}}{{if not $id}}{{range .Attributes}}{{if .Reference}}76d24097-41c4-4558-a4d0-a8c07ac08470,{{end}}{{end}}76d24097-41c4-4558-a4d0-a8c07ac08470{{end}}"