Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Vivek Reddy committed Nov 21, 2024
1 parent 7b2b625 commit 20038e9
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions pkg/splunk/client/azureblobclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@ func NewAzureBlobClient(
scopedLog.Info("Using Azure AD authentication")

// Create a Token Credential using DefaultAzureCredential.
// The Azure SDK uses environment variables to configure authentication when using DefaultAzureCredential.
// For Workload Identity, by adding annotations to the pod's service account:
// The Azure SDK uses environment variables to configure authentication when using DefaultAzureCredential.
// For Workload Identity, by adding annotations to the pod's service account:
// azure.workload.identity/client-id: <CLIENT_ID>
// the following environment variables are typically used:
// the following environment variables are typically used:
// AZURE_AUTHORITY_HOST: The Azure Active Directory endpoint (default is https://login.microsoftonline.com/).
// AZURE_CLIENT_ID: The client ID of the Azure AD application linked to the pod's service account.
// AZURE_TENANT_ID: The tenant ID of the Azure Active Directory where the Azure AD application resides.
// AZURE_FEDERATED_TOKEN_FILE: The path to the file containing the token issued by Kubernetes, usually mounted as a volume.
// when using Azure AD Pod Identity (deprecated), the following environment variables are typically used:
// when using Azure AD Pod Identity (deprecated), the following environment variables are typically used:
// AZURE_POD_IDENTITY_AUTHORITY_HOST: The Azure Active Directory endpoint (default is https://login.microsoftonline.com/).
// AZURE_POD_IDENTITY_CLIENT_ID: The client ID of the Azure AD application linked to the pod's service account.
// AZURE_POD_IDENTITY_TENANT_ID: The tenant ID of the Azure Active Directory where the Azure AD application resides.
Expand Down
4 changes: 2 additions & 2 deletions pkg/splunk/client/gcpbucketclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ func InitGCSClient(ctx context.Context, gcpCredentials string) (GCSClientInterfa
var err error

if len(gcpCredentials) == 0 {
// The storage.NewClient(ctx) internally uses Application Default Credentials (ADC) to authenticate,
// The storage.NewClient(ctx) internally uses Application Default Credentials (ADC) to authenticate,
// and ADC works with Workload Identity when the required environment variables and setup are correctly configured.
// If the environment variables are not set, the client will use the default service account credentials.
// To use Google Workload Identity with storage.NewClient(ctx), ensure the following environment variables are properly set in your pod:
// GOOGLE_APPLICATION_CREDENTIALS (Optional):
// If you're not using the default workload identity path (/var/run/secrets/google.cloud/com.google.cloudsecrets/metadata/token),
// If you're not using the default workload identity path (/var/run/secrets/google.cloud/com.google.cloudsecrets/metadata/token),
// you can set GOOGLE_APPLICATION_CREDENTIALS to point to the federated token file manually.
// Otherwise, this can be left unset when Workload Identity is configured correctly.
// GOOGLE_CLOUD_PROJECT (Optional):
Expand Down
4 changes: 2 additions & 2 deletions pkg/splunk/client/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ func NewMockAzureBlobClient(ctx context.Context, bucketName string, storageAccou
return &AzureBlobClient{
BucketName: bucketName,
StorageAccountName: storageAccountName,
Prefix: prefix,
Endpoint: endpoint,
Prefix: prefix,
Endpoint: endpoint,
}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion test/appframework_gcp/c3/manager_appframework_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2278,7 +2278,7 @@ var _ = Describe("c3appfw test", func() {
Volumes: []corev1.Volume{},
},
AppFrameworkConfig: appFrameworkSpecMC,
}
}

// Deploy Monitoring Console
testcaseEnvInst.Log.Info("Deploy Monitoring Console")
Expand Down
2 changes: 1 addition & 1 deletion test/appframework_gcp/m4/appframework_gcs_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var _ = BeforeSuite(func() {
appFileList := testenv.GetAppFileList(appListV1)

// Download V1 Apps from GCP
testenvInstance.Log.Info("logging download details", "bucket", testDataGcsBucket, "gcsAppDirV1", gcsAppDirV1, "downloadDirV1", downloadDirV1, "appFileList", appFileList)
testenvInstance.Log.Info("logging download details", "bucket", testDataGcsBucket, "gcsAppDirV1", gcsAppDirV1, "downloadDirV1", downloadDirV1, "appFileList", appFileList)
err = testenv.DownloadFilesFromGCP(testDataGcsBucket, gcsAppDirV1, downloadDirV1, appFileList)
Expect(err).To(Succeed(), "Unable to download V1 app files")

Expand Down

0 comments on commit 20038e9

Please sign in to comment.