Skip to content

Commit 1fc5d7d

Browse files
johan3141592johan3141592
authored
Fix Azure acceptance test (#189)
Added resource groups to the Azure subscription acceptance tests.
1 parent 0e6e2c3 commit 1fc5d7d

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

‎internal/provider/provider_test.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,17 @@ type testAzureSubscription struct {
219219
PrincipalName string `json:"principalName"`
220220
PrincipalSecret string `json:"principalSecret"`
221221

222+
CloudNativeProtection struct {
223+
Regions []string `json:"regions"`
224+
ResourceGroupName string `json:"resourceGroupName"`
225+
ResourceGroupRegion string `json:"resourceGroupRegion"`
226+
} `json:"cloudNativeProtection"`
227+
222228
Exocompute struct {
223-
SubnetID string `json:"subnetId"`
229+
Regions []string `json:"regions"`
230+
ResourceGroupName string `json:"resourceGroupName"`
231+
ResourceGroupRegion string `json:"resourceGroupRegion"`
232+
SubnetID string `json:"subnetId"`
224233
} `json:"exocompute"`
225234
}
226235

‎internal/provider/resource_azure_exocompute_test.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,18 @@ resource "polaris_azure_subscription" "default" {
4242
tenant_domain = "{{ .Resource.TenantDomain }}"
4343
4444
cloud_native_protection {
45+
resource_group_name = "{{ .Resource.CloudNativeProtection.ResourceGroupName }}"
46+
resource_group_region = "{{ .Resource.CloudNativeProtection.ResourceGroupRegion }}"
47+
4548
regions = [
4649
"eastus2",
4750
]
4851
}
4952
5053
exocompute {
54+
resource_group_name = "{{ .Resource.Exocompute.ResourceGroupName }}"
55+
resource_group_region = "{{ .Resource.Exocompute.ResourceGroupRegion }}"
56+
5157
regions = [
5258
"eastus2",
5359
]
@@ -86,12 +92,16 @@ func TestAccPolarisAzureExocompute_basic(t *testing.T) {
8692
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "delete_snapshots_on_destroy", "false"),
8793

8894
// Cloud Native Protection feature
89-
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "connected"),
95+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "CONNECTED"),
9096
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.#", "1"),
9197
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.*", "eastus2"),
98+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_name",
99+
subscription.CloudNativeProtection.ResourceGroupName),
100+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_region",
101+
subscription.CloudNativeProtection.ResourceGroupRegion),
92102

93103
// Exocompute feature
94-
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "exocompute.0.status", "connected"),
104+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "exocompute.0.status", "CONNECTED"),
95105
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "exocompute.0.regions.#", "1"),
96106
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "exocompute.0.regions.*", "eastus2"),
97107

‎internal/provider/resource_azure_subscription_test.go

+21-3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ resource "polaris_azure_subscription" "default" {
4242
tenant_domain = "{{ .Resource.TenantDomain }}"
4343
4444
cloud_native_protection {
45+
resource_group_name = "{{ .Resource.CloudNativeProtection.ResourceGroupName }}"
46+
resource_group_region = "{{ .Resource.CloudNativeProtection.ResourceGroupRegion }}"
47+
4548
regions = [
4649
"eastus2",
4750
]
@@ -67,6 +70,9 @@ resource "polaris_azure_subscription" "default" {
6770
tenant_domain = "{{ .Resource.TenantDomain }}"
6871
6972
cloud_native_protection {
73+
resource_group_name = "{{ .Resource.CloudNativeProtection.ResourceGroupName }}"
74+
resource_group_region = "{{ .Resource.CloudNativeProtection.ResourceGroupRegion }}"
75+
7076
regions = [
7177
"eastus2",
7278
"westus2",
@@ -105,9 +111,13 @@ func TestAccPolarisAzureSubscription_basic(t *testing.T) {
105111
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "delete_snapshots_on_destroy", "false"),
106112

107113
// Cloud Native Protection feature
108-
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "connected"),
114+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "CONNECTED"),
109115
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.#", "1"),
110116
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.*", "eastus2"),
117+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_name",
118+
subscription.CloudNativeProtection.ResourceGroupName),
119+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_region",
120+
subscription.CloudNativeProtection.ResourceGroupRegion),
111121
),
112122
}, {
113123
Config: subscriptionTwoRegions,
@@ -119,10 +129,14 @@ func TestAccPolarisAzureSubscription_basic(t *testing.T) {
119129
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "delete_snapshots_on_destroy", "false"),
120130

121131
// Cloud Native Protection feature
122-
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "connected"),
132+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "CONNECTED"),
123133
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.#", "2"),
124134
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.*", "eastus2"),
125135
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.*", "westus2"),
136+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_name",
137+
subscription.CloudNativeProtection.ResourceGroupName),
138+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_region",
139+
subscription.CloudNativeProtection.ResourceGroupRegion),
126140
),
127141
}, {
128142
Config: subscriptionOneRegion,
@@ -134,9 +148,13 @@ func TestAccPolarisAzureSubscription_basic(t *testing.T) {
134148
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "delete_snapshots_on_destroy", "false"),
135149

136150
// Cloud Native Protection feature
137-
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "connected"),
151+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.status", "CONNECTED"),
138152
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.#", "1"),
139153
resource.TestCheckTypeSetElemAttr("polaris_azure_subscription.default", "cloud_native_protection.0.regions.*", "eastus2"),
154+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_name",
155+
subscription.CloudNativeProtection.ResourceGroupName),
156+
resource.TestCheckResourceAttr("polaris_azure_subscription.default", "cloud_native_protection.0.resource_group_region",
157+
subscription.CloudNativeProtection.ResourceGroupRegion),
140158
),
141159
}},
142160
})

0 commit comments

Comments
 (0)