Fix linting

hashicorp · Oct 6, 2021 · 080a1d5 · 080a1d5
1 parent 66dbf2a
commit 080a1d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/internal/services/mssql/helper/database.go b/internal/services/mssql/helper/database.go
@@ -79,9 +79,6 @@ func FindDatabaseReplicationPartners(ctx context.Context, databasesClient *sql.D
 					}
 					return nil, fmt.Errorf("reading Replication Links for Database %s (%s): %+v", *linkProps.PartnerDatabase, partnerServerId, err)
 				}
-				if linksPossiblePartnerIterator.Value == nil {
-					return nil, fmt.Errorf("reading Replication Links for Database %s (%s): response was nil", *linkProps.PartnerDatabase, partnerServerId)
-				}
 
 				linkPossiblePartner := linksPossiblePartnerIterator.Value()
 				if linkPossiblePartner.ReplicationLinkProperties == nil {

diff --git a/internal/services/mssql/mssql_database_resource.go b/internal/services/mssql/mssql_database_resource.go
@@ -470,8 +470,6 @@ func resourceMsSqlDatabaseCreateUpdate(d *pluginsdk.ResourceData, meta interface
 	currentBackupStorageRedundancy := sql.CurrentBackupStorageRedundancyGeo
 	if storageAccountType == "LRS" {
 		currentBackupStorageRedundancy = sql.CurrentBackupStorageRedundancyLocal
-	} else if storageAccountType == "GRS" {
-		currentBackupStorageRedundancy = sql.CurrentBackupStorageRedundancyGeo
 	} else if storageAccountType == "ZRS" {
 		currentBackupStorageRedundancy = sql.CurrentBackupStorageRedundancyZone
 	}
@@ -706,10 +704,10 @@ func resourceMsSqlDatabaseRead(d *pluginsdk.ResourceData, meta interface{}) erro
 		d.Set("sku_name", skuName)
 		if props.CurrentBackupStorageRedundancy == sql.CurrentBackupStorageRedundancyLocal {
 			d.Set("storage_account_type", "LRS")
-		} else if props.CurrentBackupStorageRedundancy == sql.CurrentBackupStorageRedundancyGeo {
-			d.Set("storage_account_type", "GRS")
 		} else if props.CurrentBackupStorageRedundancy == sql.CurrentBackupStorageRedundancyZone {
 			d.Set("storage_account_type", "ZRS")
+		} else {
+			d.Set("storage_account_type", "GRS")
 		}
 		d.Set("zone_redundant", props.ZoneRedundant)
 	}