Fix name based queries for device admin and network access data sources

CiscoDevNet · Jan 22, 2024 · 5a9b0b4 · 5a9b0b4
1 parent 954b4ee
commit 5a9b0b4
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.1.11 (unreleased)
 
 - Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+- Fix name-based queries for `device_admin` and `network_access` data sources
 
 ## 0.1.10
 

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -10,6 +10,7 @@ description: |-
 ## 0.1.11 (unreleased)
 
 - Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+- Fix name-based queries for `device_admin` and `network_access` data sources
 
 ## 0.1.10
 

diff --git a/gen/generator.go b/gen/generator.go
@@ -247,19 +247,26 @@ func IsErs(endpoint string) bool {
 	return false
 }
 
+// Templating helper function to remove first path element
+func RemoveFirstPathElement(path string) string {
+	elements := strings.Split(path, ".")
+	return strings.Join(elements[1:], ".")
+}
+
 // Map of templating functions
 var functions = template.FuncMap{
-	"toGoName":     ToGoName,
-	"camelCase":    CamelCase,
-	"snakeCase":    SnakeCase,
-	"sprintf":      fmt.Sprintf,
-	"toLower":      strings.ToLower,
-	"path":         BuildPath,
-	"hasId":        HasId,
-	"hasReference": HasReference,
-	"importParts":  ImportParts,
-	"subtract":     Subtract,
-	"isErs":        IsErs,
+	"toGoName":               ToGoName,
+	"camelCase":              CamelCase,
+	"snakeCase":              SnakeCase,
+	"sprintf":                fmt.Sprintf,
+	"toLower":                strings.ToLower,
+	"path":                   BuildPath,
+	"hasId":                  HasId,
+	"hasReference":           HasReference,
+	"importParts":            ImportParts,
+	"subtract":               Subtract,
+	"isErs":                  IsErs,
+	"removeFirstPathElement": RemoveFirstPathElement,
 }
 
 func augmentAttribute(attr *YamlConfigAttribute) {

diff --git a/gen/templates/data_source.go b/gen/templates/data_source.go
diff --git a/internal/provider/data_source_ise_device_admin_authentication_rule.go b/internal/provider/data_source_ise_device_admin_authentication_rule.go
diff --git a/internal/provider/data_source_ise_device_admin_authorization_exception_rule.go b/internal/provider/data_source_ise_device_admin_authorization_exception_rule.go
diff --git a/internal/provider/data_source_ise_device_admin_authorization_global_exception_rule.go b/internal/provider/data_source_ise_device_admin_authorization_global_exception_rule.go
diff --git a/internal/provider/data_source_ise_device_admin_authorization_rule.go b/internal/provider/data_source_ise_device_admin_authorization_rule.go
diff --git a/internal/provider/data_source_ise_network_access_authentication_rule.go b/internal/provider/data_source_ise_network_access_authentication_rule.go
diff --git a/internal/provider/data_source_ise_network_access_authorization_exception_rule.go b/internal/provider/data_source_ise_network_access_authorization_exception_rule.go
diff --git a/internal/provider/data_source_ise_network_access_authorization_global_exception_rule.go b/internal/provider/data_source_ise_network_access_authorization_global_exception_rule.go
diff --git a/internal/provider/data_source_ise_network_access_authorization_rule.go b/internal/provider/data_source_ise_network_access_authorization_rule.go
diff --git a/templates/guides/changelog.md.tmpl b/templates/guides/changelog.md.tmpl
@@ -10,6 +10,7 @@ description: |-
 ## 0.1.11 (unreleased)
 
 - Fix import operation of nested resources (e.g. `ise_network_access_authentication_rule`)
+- Fix name-based queries for `device_admin` and `network_access` data sources
 
 ## 0.1.10