From 8bc3cd1dce565a95e518034e81db6abd14890f49 Mon Sep 17 00:00:00 2001 From: Guilherme Oenning Date: Wed, 4 May 2022 14:32:33 +0100 Subject: [PATCH] fix prettier-S Signed-off-by: Guilherme Oenning --- docs/features/kubernetes/configuration.md | 4 ++-- .../AzureIdentityKubernetesAuthTranslator.ts | 4 ++-- .../src/kubernetes-auth-provider/KubernetesAuthProviders.ts | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/features/kubernetes/configuration.md b/docs/features/kubernetes/configuration.md index d880aaf6cd..5b60316fd0 100644 --- a/docs/features/kubernetes/configuration.md +++ b/docs/features/kubernetes/configuration.md @@ -90,8 +90,8 @@ cluster. Valid values are: | `serviceAccount` | This will use a Kubernetes [service account](https://kubernetes.io/docs/reference/access-authn-authz/service-accounts-admin/) to access the Kubernetes API. When this is used the `serviceAccountToken` field should also be set. | | `google` | This will use a user's Google auth token from the [Google auth plugin](https://backstage.io/docs/auth/) to access the Kubernetes API. | | `aws` | This will use AWS credentials to access resources in EKS clusters | -| `googleServiceAccount` | This will use the Google Cloud service account credentials to access resources in clusters -| `azure` | This will use [Azure Identity](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview) to access resources in clusters | +| `googleServiceAccount` | This will use the Google Cloud service account credentials to access resources in clusters | +| `azure` | This will use [Azure Identity](https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview) to access resources in clusters | ##### `clusters.\*.skipTLSVerify` diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts index ab6469b4e4..20b519c269 100644 --- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts +++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts @@ -18,7 +18,7 @@ import { KubernetesAuthTranslator } from './types'; import { AzureClusterDetails } from '../types/types'; import { DefaultAzureCredential } from '@azure/identity'; -const aksScope = "6dae42f8-4368-4678-94ff-3960e28e3630/.default" // This scope is the same for all Azure Managed Kubernetes +const aksScope = '6dae42f8-4368-4678-94ff-3960e28e3630/.default'; // This scope is the same for all Azure Managed Kubernetes export class AzureIdentityKubernetesAuthTranslator implements KubernetesAuthTranslator @@ -35,7 +35,7 @@ export class AzureIdentityKubernetesAuthTranslator // TODO: can we cache this? It's inneficiant to get a new token every time const accessToken = await credentials.getToken(aksScope); - clusterDetailsWithAuthToken.serviceAccountToken = accessToken.token + clusterDetailsWithAuthToken.serviceAccountToken = accessToken.token; return clusterDetailsWithAuthToken; } } diff --git a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts index 5bccccc43d..00d5a17f72 100644 --- a/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts +++ b/plugins/kubernetes/src/kubernetes-auth-provider/KubernetesAuthProviders.ts @@ -44,7 +44,10 @@ export class KubernetesAuthProviders implements KubernetesAuthProvidersApi { new GoogleServiceAccountAuthProvider(), ); this.kubernetesAuthProviderMap.set('aws', new AwsKubernetesAuthProvider()); - this.kubernetesAuthProviderMap.set('azure', new AzureKubernetesAuthProvider()); + this.kubernetesAuthProviderMap.set( + 'azure', + new AzureKubernetesAuthProvider(), + ); } async decorateRequestBodyForAuth(