Fixup after rebase

Azure · Sep 20, 2023 · 54bcf14 · 54bcf14
1 parent b8c969c
commit 54bcf14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/cli/azd/pkg/environment/environment.go b/cli/azd/pkg/environment/environment.go
@@ -13,7 +13,6 @@ import (
 	"maps"
 
 	"github.com/azure/azure-dev/cli/azd/pkg/config"
-	"github.com/google/uuid"
 	"github.com/joho/godotenv"
 )
 
@@ -161,11 +160,6 @@ func (e *Environment) DotenvSet(key string, value string) {
 	delete(e.deletedKeys, key)
 }
 
-		if _, err := uuid.Parse(e.GetSubscriptionId()); err == nil {
-			tracing.SetGlobalAttributes(fields.SubscriptionIdKey.String(e.GetSubscriptionId()))
-		} else {
-			tracing.SetGlobalAttributes(fields.StringHashed(fields.SubscriptionIdKey, e.GetSubscriptionId()))
-		}
 // GetEnvName is shorthand for Getenv(EnvNameEnvVarName)
 func (e *Environment) GetEnvName() string {
 	return e.Getenv(EnvNameEnvVarName)

diff --git a/cli/azd/pkg/environment/local_file_data_store.go b/cli/azd/pkg/environment/local_file_data_store.go
@@ -12,6 +12,7 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/config"
 	"github.com/azure/azure-dev/cli/azd/pkg/contracts"
 	"github.com/azure/azure-dev/cli/azd/pkg/environment/azdcontext"
+	"github.com/google/uuid"
 	"github.com/joho/godotenv"
 	"golang.org/x/exp/slices"
 )
@@ -118,8 +119,10 @@ func (fs *LocalFileDataStore) Reload(ctx context.Context, env *Environment) erro
 		tracing.SetUsageAttributes(fields.StringHashed(fields.EnvNameKey, env.GetEnvName()))
 	}
 
-	if env.GetSubscriptionId() != "" {
+	if _, err := uuid.Parse(env.GetSubscriptionId()); err == nil {
 		tracing.SetGlobalAttributes(fields.SubscriptionIdKey.String(env.GetSubscriptionId()))
+	} else {
+		tracing.SetGlobalAttributes(fields.StringHashed(fields.SubscriptionIdKey, env.GetSubscriptionId()))
 	}
 
 	return nil

diff --git a/cli/azd/pkg/environment/storage_blob_data_store.go b/cli/azd/pkg/environment/storage_blob_data_store.go
@@ -13,6 +13,7 @@ import (
 	"github.com/azure/azure-dev/cli/azd/pkg/azsdk/storage"
 	"github.com/azure/azure-dev/cli/azd/pkg/config"
 	"github.com/azure/azure-dev/cli/azd/pkg/contracts"
+	"github.com/google/uuid"
 	"github.com/joho/godotenv"
 	"golang.org/x/exp/slices"
 )
@@ -172,8 +173,10 @@ func (sbd *StorageBlobDataStore) Reload(ctx context.Context, env *Environment) e
 		tracing.SetUsageAttributes(fields.StringHashed(fields.EnvNameKey, env.GetEnvName()))
 	}
 
-	if env.GetSubscriptionId() != "" {
+	if _, err := uuid.Parse(env.GetSubscriptionId()); err == nil {
 		tracing.SetGlobalAttributes(fields.SubscriptionIdKey.String(env.GetSubscriptionId()))
+	} else {
+		tracing.SetGlobalAttributes(fields.StringHashed(fields.SubscriptionIdKey, env.GetSubscriptionId()))
 	}
 
 	return nil