Skip to content

Commit

Permalink
rename functions for azure
Browse files Browse the repository at this point in the history
  • Loading branch information
fujiwara committed Nov 16, 2023
1 parent cbe77de commit 85f935d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tfstate/remote_azurerm.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func readAzureRM(ctx context.Context, resourceGroupName string, accountName stri
for _, gen := range []func() (string, error){
func() (string, error) { return opt.accessKey, nil },
func() (string, error) { return os.Getenv("AZURE_STORAGE_ACCESS_KEY"), nil },
func() (string, error) { return getDefaultAccessKey(ctx, resourceGroupName, accountName, opt) },
func() (string, error) { return getDefaultAzureAccessKey(ctx, resourceGroupName, accountName, opt) },
} {
key, err := gen()
if err != nil {
Expand Down Expand Up @@ -94,7 +94,7 @@ func readAzureRM(ctx context.Context, resourceGroupName string, accountName stri
return r, nil
}

func getDefaultSubscription() (string, error) {
func getDefaultAzureSubscription() (string, error) {
if value, ok := os.LookupEnv("AZURE_SUBSCRIPTION_ID"); ok {
return value, nil
}
Expand All @@ -114,13 +114,13 @@ func getDefaultSubscription() (string, error) {
return subscriptionID, nil
}

func getDefaultAccessKey(ctx context.Context, resourceGroupName string, accountName string, opt azureRMOption) (string, error) {
func getDefaultAzureAccessKey(ctx context.Context, resourceGroupName string, accountName string, opt azureRMOption) (string, error) {
cred, err := getDefaultAzureCredential()
if err != nil {
return "", err
}

subscriptionID, err := getSubscription(opt)
subscriptionID, err := getAzureSubscription(opt)
if err != nil {
return "", err
}
Expand All @@ -134,12 +134,12 @@ func getDefaultAccessKey(ctx context.Context, resourceGroupName string, accountN
return *keys.Keys[0].Value, nil
}

func getSubscription(opt azureRMOption) (string, error) {
func getAzureSubscription(opt azureRMOption) (string, error) {
if opt.subscriptionID != "" {
return opt.subscriptionID, nil
}

subscriptionID, err := getDefaultSubscription()
subscriptionID, err := getDefaultAzureSubscription()
if err != nil {
return "", errors.Wrap(err, "failed to get default subscription")
}
Expand Down

0 comments on commit 85f935d

Please sign in to comment.