Merge branch 'main' into pnp

kuba-mazurkiewicz · kuba-mazurkiewicz · commit 7d5144030ad9 · 2024-08-05T10:15:45.000+02:00
diff --git a/docs/data-sources/fabric_l3_handoff_ip_transit.md b/docs/data-sources/fabric_l3_handoff_ip_transit.md
@@ -14,6 +14,7 @@ This data source can read the Fabric L3 Handoff IP Transit.
 
 ```terraform
 data "catalystcenter_fabric_l3_handoff_ip_transit" "example" {
+  id                = "76d24097-41c4-4558-a4d0-a8c07ac08470"
   network_device_id = "5e6f7b3a-2b0b-4a7d-8b1c-0d4b1cd5e1b1"
   fabric_id         = "c4b85bb2-ce3f-4db9-a32b-e439a388ac2f"
 }
@@ -25,12 +26,12 @@ data "catalystcenter_fabric_l3_handoff_ip_transit" "example" {
 ### Required
 
 - `fabric_id` (String) ID of the fabric this device belongs to
+- `id` (String) The id of the object
 - `network_device_id` (String) Network device ID of the fabric device
 
 ### Read-Only
 
 - `external_connectivity_ip_pool_name` (String) External connectivity ip pool will be used by Catalyst Center to allocate IP address for the connection between the border node and peer
-- `id` (String) The id of the object
 - `interface_name` (String) Interface name of the layer 3 handoff ip transit
 - `local_ip_address` (String) Local ipv4 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
 - `local_ipv6_address` (String) Local ipv6 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
diff --git a/docs/resources/fabric_l3_handoff_ip_transit.md b/docs/resources/fabric_l3_handoff_ip_transit.md
@@ -57,5 +57,5 @@ resource "catalystcenter_fabric_l3_handoff_ip_transit" "example" {
 Import is supported using the following syntax:
 
 ```shell
-terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>"
+terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>,<id>"
 ```
diff --git a/examples/data-sources/catalystcenter_fabric_l3_handoff_ip_transit/data-source.tf b/examples/data-sources/catalystcenter_fabric_l3_handoff_ip_transit/data-source.tf
@@ -1,4 +1,5 @@
 data "catalystcenter_fabric_l3_handoff_ip_transit" "example" {
+  id                = "76d24097-41c4-4558-a4d0-a8c07ac08470"
   network_device_id = "5e6f7b3a-2b0b-4a7d-8b1c-0d4b1cd5e1b1"
   fabric_id         = "c4b85bb2-ce3f-4db9-a32b-e439a388ac2f"
 }
diff --git a/examples/resources/catalystcenter_fabric_l3_handoff_ip_transit/import.sh b/examples/resources/catalystcenter_fabric_l3_handoff_ip_transit/import.sh
@@ -1 +1 @@
-terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>"
+terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>,<id>"
diff --git a/gen/definitions/fabric_authentication_profile.yaml b/gen/definitions/fabric_authentication_profile.yaml
@@ -6,6 +6,7 @@ id_query_param: siteNameHierarchy
 delete_id_query_param: siteNameHierarchy
 no_update: true
 skip_minimum_test: true
+test_tags: [FABRIC]
 doc_category: SDA
 attributes:
   - model_name: siteNameHierarchy
@@ -15,7 +16,7 @@ attributes:
     id: true
     description: Path of SDA Fabric Site
     example: Global/Site1
-    test_value: 'catalystcenter_fabric_site.test.site_name_hierarchy'
+    test_value: '"${catalystcenter_area.test.parent_name}/${catalystcenter_area.test.name}"'
   - model_name: authenticateTemplateName
     tf_name: authentication_template_name    
     data_path: "0"
@@ -35,7 +36,9 @@ test_prerequisites: |
     name        = "Area1"
     parent_name = "Global"
   }
+
   resource "catalystcenter_fabric_site" "test" {
-    site_name_hierarchy = "${catalystcenter_area.test.parent_name}/${catalystcenter_area.test.name}"
-    fabric_type = "FABRIC_SITE"
-  }
+    site_id                     = catalystcenter_area.test.id
+    authentication_profile_name = "No Authentication"
+    pub_sub_enabled             = false
+  }
diff --git a/gen/definitions/fabric_l3_handoff_ip_transit.yaml b/gen/definitions/fabric_l3_handoff_ip_transit.yaml
@@ -2,11 +2,10 @@
 name: Fabric L3 Handoff IP Transit
 rest_endpoint: /dna/intent/api/v1/sda/fabricDevices/layer3Handoffs/ipTransits
 res_description: Manages Layer 3 Handoffs with IP Transit in Fabric Devices
-id_from_query_path: response.0
+id_from_query_path: response
 id_from_query_path_attribute: id
 put_id_include_path: 0.id
-import_no_id: true
-data_source_no_id: true
+get_from_all: true
 put_no_id: true
 doc_category: SDA
 test_tags: [SDA]
@@ -15,7 +14,7 @@ attributes:
     query_param: true
     requires_replace: true
     data_path: '0'
-    response_data_path: response.0.networkDeviceId
+    response_data_path: networkDeviceId
     mandatory: true
     description: Network device ID of the fabric device
     type: String
@@ -24,7 +23,7 @@ attributes:
     requires_replace: true
     query_param: true
     data_path: '0'
-    response_data_path: response.0.fabricId
+    response_data_path: fabricId
     type: String
     mandatory: true
     description: ID of the fabric this device belongs to
@@ -33,7 +32,7 @@ attributes:
   - model_name: transitNetworkId
     requires_replace: true
     data_path: '0'
-    response_data_path: response.0.transitNetworkId
+    response_data_path: transitNetworkId
     type: String
     mandatory: true
     description: ID of the transit network of the layer 3 handoff ip transit
@@ -42,37 +41,38 @@ attributes:
   - model_name: interfaceName
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.interfaceName
+    response_data_path: interfaceName
     type: String
     description:  Interface name of the layer 3 handoff ip transit
     example: TenGigabitEthernet1/0/2
   - model_name: externalConnectivityIpPoolName
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.externalConnectivityIpPoolName
+    response_data_path: externalConnectivityIpPoolName
     type: String
     description:  External connectivity ip pool will be used by Catalyst Center to allocate IP address for the connection between the border node and peer
     example: "MyPool1"
     exclude_test: true
   - model_name: virtualNetworkName
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.virtualNetworkName
+    match_id: true
+    response_data_path: virtualNetworkName
     mandatory: true
     type: String
     description: SName of the virtual network associated with this fabric site
     example: SDA_VN1
   - model_name: vlanId
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.vlanId
+    response_data_path: vlanId
     type: Int64
     mandatory: true
     description: VLAN number for the Switch Virtual Interface (SVI) used to establish BGP peering with the external domain for the virtual network. Allowed VLAN range is 2-4094 except for reserved vlans (1, 1002-1005, 2046, 4094)
     example: 205
   - model_name: tcpMssAdjustment
     data_path: '0'
-    response_data_path: response.0.tcpMssAdjustment
+    response_data_path: tcpMssAdjustment
     type: Int64
     min_int: 500
     max_int: 1440
@@ -81,28 +81,28 @@ attributes:
   - model_name: localIpAddress
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.localIpAddress
+    response_data_path: localIpAddress
     type: String
     description: Local ipv4 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
     example: "10.0.0.1/24"
   - model_name: remoteIpAddress
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.remoteIpAddress
+    response_data_path: remoteIpAddress
     type: String
     description: Remote ipv4 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
     example: "10.0.0.2/24"
   - model_name: localIpv6Address
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.localIpv6Address
+    response_data_path: localIpv6Address
     type: String
     description: Local ipv6 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
     exclude_test: true
   - model_name: remoteIpv6Address
     data_path: '0'
     requires_replace: true
-    response_data_path: response.0.remoteIpv6Address
+    response_data_path: remoteIpv6Address
     type: String
     description: Remote ipv6 address for the selected virtual network. Enter the IP addresses and subnet mask in the CIDR notation (IP address/prefix-length). Not applicable if you have already provided an external connectivity ip pool name
     exclude_test: true
diff --git a/gen/definitions/virtual_network_ip_pool.yaml b/gen/definitions/virtual_network_ip_pool.yaml
@@ -130,9 +130,9 @@ test_prerequisites: |
     depends_on = [catalystcenter_ip_pool.test]
   }
   resource "catalystcenter_fabric_site" "test" {
-    site_name_hierarchy = "Global/Area1"
-    fabric_type         = "FABRIC_SITE"
-    depends_on = [catalystcenter_area.test]
+    site_id                     = catalystcenter_area.test.id
+    authentication_profile_name = "No Authentication"
+    pub_sub_enabled             = false
   }
   resource "catalystcenter_fabric_virtual_network" "test" {
     virtual_network_name = "SDA_VN1"
diff --git a/gen/definitions/virtual_network_to_fabric_site.yaml b/gen/definitions/virtual_network_to_fabric_site.yaml
@@ -14,28 +14,31 @@ attributes:
     data_source_query: true
     description: Virtual Network Name, that is created at Global level
     example: SDA_VN1
-    test_value: catalystcenter_fabric_virtual_network.test.virtual_network_name
+    test_value: catalystcenter_fabric_virtual_network.test.id
   - model_name: siteNameHierarchy
     mandatory: true
     data_source_query: true
     type: String
     description: Path of SDA Fabric Site, e.g. `Global/Area1
     example: "Global/Area1"
-    test_value: catalystcenter_fabric_site.test.site_name_hierarchy
+    test_value: '"${catalystcenter_area.test.parent_name}/${catalystcenter_area.test.name}"'
 test_prerequisites: |
   resource "catalystcenter_area" "test" {
     name        = "Area1"
     parent_name = "Global"
   }
   resource "catalystcenter_fabric_site" "test" {
-    site_name_hierarchy = "Global/Area1"
-    fabric_type         = "FABRIC_SITE"
+    site_id                     = catalystcenter_area.test.id
+    authentication_profile_name = "No Authentication"
+    pub_sub_enabled             = false
 
     depends_on = [catalystcenter_area.test]
   }
   resource "catalystcenter_fabric_virtual_network" "test" {
     virtual_network_name = "SDA_VN1"
     is_guest             = false
     sg_names             = ["Employees"]
+
+    depends_on = [catalystcenter_fabric_site.test]
   }
 
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-testing v1.9.0
 	github.com/netascode/go-catalystcenter v0.1.5
-	github.com/tidwall/gjson v1.17.1
+	github.com/tidwall/gjson v1.17.3
 	github.com/tidwall/sjson v1.2.5
 	golang.org/x/tools v0.23.0
 	gopkg.in/yaml.v3 v3.0.1
diff --git a/go.sum b/go.sum
@@ -190,8 +190,8 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
-github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.3 h1:bwWLZU7icoKRG+C+0PNwIKC6FCJO/Q3p2pZvuP0jN94=
+github.com/tidwall/gjson v1.17.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
diff --git a/internal/provider/data_source_catalystcenter_fabric_authentication_profile_test.go b/internal/provider/data_source_catalystcenter_fabric_authentication_profile_test.go
@@ -19,6 +19,7 @@ package provider
 
 // Section below is generated&owned by "gen/generator.go". //template:begin imports
 import (
+	"os"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -28,6 +29,9 @@ import (
 
 // Section below is generated&owned by "gen/generator.go". //template:begin testAccDataSource
 func TestAccDataSourceCcFabricAuthenticationProfile(t *testing.T) {
+	if os.Getenv("FABRIC") == "" {
+		t.Skip("skipping test, set environment variable FABRIC")
+	}
 	var checks []resource.TestCheckFunc
 	checks = append(checks, resource.TestCheckResourceAttr("data.catalystcenter_fabric_authentication_profile.test", "authentication_template_name", "No Authentication"))
 	resource.Test(t, resource.TestCase{
@@ -50,18 +54,21 @@ resource "catalystcenter_area" "test" {
   name        = "Area1"
   parent_name = "Global"
 }
+
 resource "catalystcenter_fabric_site" "test" {
-  site_name_hierarchy = "${catalystcenter_area.test.parent_name}/${catalystcenter_area.test.name}"
-  fabric_type = "FABRIC_SITE"
+  site_id                     = catalystcenter_area.test.id
+  authentication_profile_name = "No Authentication"
+  pub_sub_enabled             = false
 }
+
 `
 
 // End of section. //template:end testPrerequisites
 
 // Section below is generated&owned by "gen/generator.go". //template:begin testAccDataSourceConfig
 func testAccDataSourceCcFabricAuthenticationProfileConfig() string {
 	config := `resource "catalystcenter_fabric_authentication_profile" "test" {` + "\n"
-	config += `	site_name_hierarchy = catalystcenter_fabric_site.test.site_name_hierarchy` + "\n"
+	config += `	site_name_hierarchy = "${catalystcenter_area.test.parent_name}/${catalystcenter_area.test.name}"` + "\n"
 	config += `	authentication_template_name = "No Authentication"` + "\n"
 	config += `}` + "\n"
 
diff --git a/internal/provider/data_source_catalystcenter_fabric_l3_handoff_ip_transit.go b/internal/provider/data_source_catalystcenter_fabric_l3_handoff_ip_transit.go
@@ -59,7 +59,7 @@ func (d *FabricL3HandoffIPTransitDataSource) Schema(ctx context.Context, req dat
 		Attributes: map[string]schema.Attribute{
 			"id": schema.StringAttribute{
 				MarkdownDescription: "The id of the object",
-				Computed:            true,
+				Required:            true,
 			},
 			"network_device_id": schema.StringAttribute{
 				MarkdownDescription: "Network device ID of the fabric device",
@@ -143,6 +143,7 @@ func (d *FabricL3HandoffIPTransitDataSource) Read(ctx context.Context, req datas
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Failed to retrieve object, got error: %s", err))
 		return
 	}
+	res = res.Get("response.#(id==\"" + config.Id.ValueString() + "\")")
 
 	config.fromBody(ctx, res)
 
diff --git a/internal/provider/model_catalystcenter_fabric_l3_handoff_ip_transit.go b/internal/provider/model_catalystcenter_fabric_l3_handoff_ip_transit.go
diff --git a/internal/provider/resource_catalystcenter_fabric_authentication_profile_test.go b/internal/provider/resource_catalystcenter_fabric_authentication_profile_test.go
diff --git a/internal/provider/resource_catalystcenter_fabric_l3_handoff_ip_transit.go b/internal/provider/resource_catalystcenter_fabric_l3_handoff_ip_transit.go
diff --git a/internal/provider/resource_catalystcenter_virtual_network_ip_pool_test.go b/internal/provider/resource_catalystcenter_virtual_network_ip_pool_test.go
diff --git a/internal/provider/resource_catalystcenter_virtual_network_to_fabric_site_test.go b/internal/provider/resource_catalystcenter_virtual_network_to_fabric_site_test.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`data "catalystcenter_fabric_l3_handoff_ip_transit" "example" {`
	`2`	`+ id = "76d24097-41c4-4558-a4d0-a8c07ac08470"`
`2`	`3`	`network_device_id = "5e6f7b3a-2b0b-4a7d-8b1c-0d4b1cd5e1b1"`
`3`	`4`	`fabric_id = "c4b85bb2-ce3f-4db9-a32b-e439a388ac2f"`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>"`
	`1`	`+terraform import catalystcenter_fabric_l3_handoff_ip_transit.example "<network_device_id>,<fabric_id>,<id>"`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,9 @@ test_prerequisites: \|`
`130`	`130`	`depends_on = [catalystcenter_ip_pool.test]`
`131`	`131`	`}`
`132`	`132`	`resource "catalystcenter_fabric_site" "test" {`
`133`		`- site_name_hierarchy = "Global/Area1"`
`134`		`- fabric_type = "FABRIC_SITE"`
`135`		`- depends_on = [catalystcenter_area.test]`
	`133`	`+ site_id = catalystcenter_area.test.id`
	`134`	`+ authentication_profile_name = "No Authentication"`
	`135`	`+ pub_sub_enabled = false`
`136`	`136`	`}`
`137`	`137`	`resource "catalystcenter_fabric_virtual_network" "test" {`
`138`	`138`	`virtual_network_name = "SDA_VN1"`