Skip to content

[fix] Allow to use multiple providers #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jiangpengcheng merged 1 commit into from
Jul 10, 2025
Merged

[fix] Allow to use multiple providers #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 27 additions & 12 deletions cloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package cloud

import (
"context"
"crypto/sha256"
"encoding/base64"
"fmt"
"os"
Expand All @@ -25,7 +26,6 @@ import (
"github.com/99designs/keyring"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/mitchellh/go-homedir"
"github.com/streamnative/cloud-cli/pkg/auth"
"github.com/streamnative/cloud-cli/pkg/auth/store"
"github.com/streamnative/cloud-cli/pkg/cmd"
Expand Down Expand Up @@ -253,16 +253,6 @@ func Provider() *schema.Provider {
func providerConfigure(d *schema.ResourceData, terraformVersion string) (interface{}, diag.Diagnostics) {
_ = terraformVersion

home, err := homedir.Dir()
if err != nil {
return nil, diag.FromErr(err)
}
configDir := filepath.Join(home, ".streamnative")
if _, err := os.Stat(configDir); os.IsNotExist(err) {
if err = os.MkdirAll(configDir, 0755); err != nil {
return nil, diag.FromErr(err)
}
}
defaultIssuer := os.Getenv("GLOBAL_DEFAULT_ISSUER")
if defaultIssuer == "" {
defaultIssuer = GlobalDefaultIssuer
Expand All @@ -277,6 +267,12 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa
}
clientId := d.Get("client_id").(string)
clientSecret := d.Get("client_secret").(string)
keyFilePath := d.Get("key_file_path").(string)
configDir, err := getConfigDir(clientId, clientSecret, keyFilePath)
if err != nil {
return nil, diag.FromErr(err)
}

var keyFile *auth.KeyFile
var flow *auth.ClientCredentialsFlow
var grant *auth.AuthorizationGrant
Expand Down Expand Up @@ -305,7 +301,6 @@ func providerConfigure(d *schema.ResourceData, terraformVersion string) (interfa
return nil, diag.FromErr(err)
}
} else {
keyFilePath := d.Get("key_file_path").(string)
credsProvider := auth.NewClientCredentialsProviderFromKeyFile(keyFilePath)
keyFile, err = credsProvider.GetClientCredentials()
if err != nil {
Expand Down Expand Up @@ -405,3 +400,23 @@ func makeKeyring(backendOverride string, configDir string) (keyring.Keyring, err
func keyringPrompt(prompt string) (string, error) {
return "", nil
}

// getConfigDir generate a unique configuration directory based on the provided arguments
func getConfigDir(clientId, clientSecret, keyFilePath string) (string, error) {
home, err := os.Getwd()
if err != nil {
return "", fmt.Errorf("failed to get current working directory: %v", err)
}
combined := fmt.Sprintf("%s|%s|%s", keyFilePath, clientId, clientSecret)
hash := sha256.Sum256([]byte(combined))
dirName := fmt.Sprintf(".streamnative_%x", hash[:8])

configDir := filepath.Join(home, dirName)

if _, err := os.Stat(configDir); os.IsNotExist(err) {
if err = os.MkdirAll(configDir, 0755); err != nil {
return "", fmt.Errorf("failed to create config directory: %v", err)
}
}
return configDir, nil
}