Removed un-needed setup in end 2 end tests.

NHSDigital · Oct 19, 2024 · dcbac05 · dcbac05
1 parent 4c4ea0f
commit dcbac05
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 43 deletions.
diff --git a/tests/end-to-end-tests/blob_storage_backup_test.go b/tests/end-to-end-tests/blob_storage_backup_test.go
@@ -57,13 +57,6 @@ func TestBlobStorageBackup(t *testing.T) {
 	resourceGroupName := fmt.Sprintf("rg-nhsbackup-%s", uniqueId)
 	resourceGroupLocation := "uksouth"
 	backupVaultName := fmt.Sprintf("bvault-nhsbackup-%s", uniqueId)
-	backupVaultRedundancy := "LocallyRedundant"
-
-	tags := map[string]string{
-		"tagOne":   "tagOneValue",
-		"tagTwo":   "tagTwoValue",
-		"tagThree": "tagThreeValue",
-	}
 
 	externalResources := setupExternalResourcesForBlobStorageBackupTest(t, credential, environment.SubscriptionID, resourceGroupName, resourceGroupLocation, uniqueId)
 
@@ -104,8 +97,6 @@ func TestBlobStorageBackup(t *testing.T) {
 				"resource_group_name":     resourceGroupName,
 				"resource_group_location": resourceGroupLocation,
 				"backup_vault_name":       backupVaultName,
-				"backup_vault_redundancy": backupVaultRedundancy,
-				"tags":                    tags,
 				"blob_storage_backups":    blobStorageBackups,
 			},
 

diff --git a/tests/end-to-end-tests/diagnostic_settings_test.go b/tests/end-to-end-tests/diagnostic_settings_test.go
@@ -52,13 +52,6 @@ func TestDiagnosticSettings(t *testing.T) {
 	resourceGroupName := fmt.Sprintf("rg-nhsbackup-%s", uniqueId)
 	resourceGroupLocation := "uksouth"
 	backupVaultName := fmt.Sprintf("bvault-nhsbackup-%s", uniqueId)
-	backupVaultRedundancy := "LocallyRedundant"
-
-	tags := map[string]string{
-		"tagOne":   "tagOneValue",
-		"tagTwo":   "tagTwoValue",
-		"tagThree": "tagThreeValue",
-	}
 
 	externalResources := setupExternalResourcesForDiagnosticSettingsTest(t, credential, environment.SubscriptionID, resourceGroupName, resourceGroupLocation, uniqueId)
 
@@ -84,9 +77,7 @@ func TestDiagnosticSettings(t *testing.T) {
 				"resource_group_name":        resourceGroupName,
 				"resource_group_location":    resourceGroupLocation,
 				"backup_vault_name":          backupVaultName,
-				"backup_vault_redundancy":    backupVaultRedundancy,
 				"log_analytics_workspace_id": *externalResources.LogAnalyticsWorkspace.ID,
-				"tags":                       tags,
 			},
 
 			BackendConfig: map[string]interface{}{

diff --git a/tests/end-to-end-tests/managed_disk_backup_test.go b/tests/end-to-end-tests/managed_disk_backup_test.go
@@ -57,13 +57,6 @@ func TestManagedDiskBackup(t *testing.T) {
 	resourceGroupName := fmt.Sprintf("rg-nhsbackup-%s", uniqueId)
 	resourceGroupLocation := "uksouth"
 	backupVaultName := fmt.Sprintf("bvault-nhsbackup-%s", uniqueId)
-	backupVaultRedundancy := "LocallyRedundant"
-
-	tags := map[string]string{
-		"tagOne":   "tagOneValue",
-		"tagTwo":   "tagTwoValue",
-		"tagThree": "tagThreeValue",
-	}
 
 	externalResources := setupExternalResourcesForManagedDiskBackupTest(t, credential, environment.SubscriptionID, resourceGroupName, resourceGroupLocation, uniqueId)
 
@@ -114,8 +107,6 @@ func TestManagedDiskBackup(t *testing.T) {
 				"resource_group_name":     resourceGroupName,
 				"resource_group_location": resourceGroupLocation,
 				"backup_vault_name":       backupVaultName,
-				"backup_vault_redundancy": backupVaultRedundancy,
-				"tags":                    tags,
 				"managed_disk_backups":    managedDiskBackups,
 			},
 

diff --git a/tests/end-to-end-tests/postgresql_flexible_server_backup_test.go b/tests/end-to-end-tests/postgresql_flexible_server_backup_test.go
@@ -57,13 +57,6 @@ func TestPostgresqlFlexibleServerBackup(t *testing.T) {
 	resourceGroupName := fmt.Sprintf("rg-nhsbackup-%s", uniqueId)
 	resourceGroupLocation := "uksouth"
 	backupVaultName := fmt.Sprintf("bvault-nhsbackup-%s", uniqueId)
-	backupVaultRedundancy := "LocallyRedundant"
-
-	tags := map[string]string{
-		"tagOne":   "tagOneValue",
-		"tagTwo":   "tagTwoValue",
-		"tagThree": "tagThreeValue",
-	}
 
 	externalResources := setupExternalResourcesForPostgresqlFlexibleServerBackupTest(t, credential, environment.SubscriptionID, resourceGroupName, resourceGroupLocation, uniqueId)
 
@@ -108,8 +101,6 @@ func TestPostgresqlFlexibleServerBackup(t *testing.T) {
 				"resource_group_name":                resourceGroupName,
 				"resource_group_location":            resourceGroupLocation,
 				"backup_vault_name":                  backupVaultName,
-				"backup_vault_redundancy":            backupVaultRedundancy,
-				"tags":                               tags,
 				"postgresql_flexible_server_backups": PostgresqlFlexibleServerBackups,
 			},
 

diff --git a/tests/end-to-end-tests/terraform_output_test.go b/tests/end-to-end-tests/terraform_output_test.go
@@ -24,12 +24,6 @@ func TestTerraformOutput(t *testing.T) {
 	backupVaultName := fmt.Sprintf("bvault-nhsbackup-%s", uniqueId)
 	backupVaultRedundancy := "LocallyRedundant"
 
-	tags := map[string]string{
-		"tagOne":   "tagOneValue",
-		"tagTwo":   "tagTwoValue",
-		"tagThree": "tagThreeValue",
-	}
-
 	// Teardown stage
 	// ...
 
@@ -51,7 +45,6 @@ func TestTerraformOutput(t *testing.T) {
 				"resource_group_location": resourceGroupLocation,
 				"backup_vault_name":       backupVaultName,
 				"backup_vault_redundancy": backupVaultRedundancy,
-				"tags":                    tags,
 			},
 
 			BackendConfig: map[string]interface{}{