err is properly handled when quotaName != ""

Author: tabito-hara

internal/service/servicequotas/service_quota_data_source.go

@@ -128,7 +128,6 @@ func dataSourceServiceQuotaRead(ctx context.Context, d *schema.ResourceData, met
 	// A Service Quota will always have a default value, but will only have a current value if it has been set.
 	if quotaName != "" {
 		defaultQuota, err = findDefaultServiceQuotaByServiceCodeAndQuotaName(ctx, conn, serviceCode, quotaName)
-		quotaCode = aws.ToString(defaultQuota.QuotaCode)
 	} else {
 		defaultQuota, err = findDefaultServiceQuotaByServiceCodeAndQuotaCode(ctx, conn, serviceCode, quotaCode)
 	}
@@ -137,6 +136,10 @@ func dataSourceServiceQuotaRead(ctx context.Context, d *schema.ResourceData, met
 		return sdkdiag.AppendFromErr(diags, tfresource.SingularDataSourceFindError("Service Quotas Service Quota", err))
 	}
 
+	if quotaName != "" {
+		quotaCode = aws.ToString(defaultQuota.QuotaCode)
+	}
+
 	arn := aws.ToString(defaultQuota.QuotaArn)
 	d.SetId(arn)
 	d.Set("adjustable", defaultQuota.Adjustable)