From 9dc0c18f31ab192e7d2d8d16d83850ce70097688 Mon Sep 17 00:00:00 2001 From: Ramakrishna Pattnaik Date: Tue, 19 Oct 2021 20:04:08 +0530 Subject: [PATCH 1/2] fix(cluster connect): display service account credentials --- pkg/cluster/connect.go | 8 ++++++-- pkg/localize/locales/en/cmd/cluster.en.toml | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/connect.go b/pkg/cluster/connect.go index 9e139fa0a..dac13ba03 100644 --- a/pkg/cluster/connect.go +++ b/pkg/cluster/connect.go @@ -205,7 +205,11 @@ func (c *KubernetesClusterAPIImpl) createServiceAccountSecretIfNeeded(namespace return fmt.Errorf("%v: %w", cliOpts.Localizer.MustLocalize("cluster.kubernetes.serviceaccountsecret.error.createError"), err) } - cliOpts.Logger.Info(cliOpts.Localizer.MustLocalize("cluster.kubernetes.createSASecret.log.info.createSuccess", localize.NewEntry("Name", createdSecret.Name))) + cliOpts.Logger.Info(cliOpts.Localizer.MustLocalize("cluster.kubernetes.createSASecret.log.info.createSuccess", + localize.NewEntry("Name", createdSecret.Name), + localize.NewEntry("ClientID", serviceAcct.GetClientId()), + localize.NewEntry("ClientSecret", serviceAcct.GetClientSecret()), + )) return nil } @@ -288,7 +292,7 @@ func (api *KubernetesClusterAPIImpl) watchForServiceStatus( case <-time.After(60 * time.Second): w.Stop() - return fmt.Errorf(localizer.MustLocalize("cluster.kubernetes.watchForKafkaStatus.error.timeout")) + return fmt.Errorf(localizer.MustLocalize("cluster.kubernetes.watchForResourceStatus.error.timeout", localize.NewEntry("Resource", serviceDetails.Type))) } } } diff --git a/pkg/localize/locales/en/cmd/cluster.en.toml b/pkg/localize/locales/en/cmd/cluster.en.toml index c68e78cd3..623592dfb 100644 --- a/pkg/localize/locales/en/cmd/cluster.en.toml +++ b/pkg/localize/locales/en/cmd/cluster.en.toml @@ -231,7 +231,7 @@ one = ''' Connection Details: Service Type: {{.ServiceType}} -Service Name: {{.ServiceName}} +Service Name: {{.ServiceName}} Kubernetes Namespace: {{.Namespace}} Service Account Secret: {{.ServiceAccountSecretName}} ''' @@ -288,7 +288,19 @@ one = 'Access token already exist on the specified namespace' one = 'Token Secret "{{.Name}}" created successfully' [cluster.kubernetes.createSASecret.log.info.createSuccess] -one = 'Service Account Secret "{{.Name}}" created successfully' +one = ''' +Service Account Secret "{{.Name}}" created successfully + +Client ID: {{.ClientID}} +Client Secret: {{.ClientSecret}} + +Make a copy of the client ID and secret to store in a safe place. Credentials won't appear again after closing the terminal. + +Execute the following command to grant access to the service-account using rhoas cli + +rhoas kafka acl grant-access --producer --consumer --service-account {{.ClientID}} --topic "*" --group "*" + +''' [cluster.kubernetes.createTokenSecret.log.info.createFailed] one = 'Creation of the "{{.Name}}" secret failed:' From 1932fb56fd8af018c75cbaa2d775dd0a6ced8edc Mon Sep 17 00:00:00 2001 From: Ramakrishna Pattnaik Date: Tue, 19 Oct 2021 20:49:23 +0530 Subject: [PATCH 2/2] fix: remove client secret and indent grant command --- pkg/cluster/connect.go | 1 - pkg/localize/locales/en/cmd/cluster.en.toml | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/cluster/connect.go b/pkg/cluster/connect.go index dac13ba03..7d4ffcbe8 100644 --- a/pkg/cluster/connect.go +++ b/pkg/cluster/connect.go @@ -208,7 +208,6 @@ func (c *KubernetesClusterAPIImpl) createServiceAccountSecretIfNeeded(namespace cliOpts.Logger.Info(cliOpts.Localizer.MustLocalize("cluster.kubernetes.createSASecret.log.info.createSuccess", localize.NewEntry("Name", createdSecret.Name), localize.NewEntry("ClientID", serviceAcct.GetClientId()), - localize.NewEntry("ClientSecret", serviceAcct.GetClientSecret()), )) return nil diff --git a/pkg/localize/locales/en/cmd/cluster.en.toml b/pkg/localize/locales/en/cmd/cluster.en.toml index 623592dfb..064aae0ac 100644 --- a/pkg/localize/locales/en/cmd/cluster.en.toml +++ b/pkg/localize/locales/en/cmd/cluster.en.toml @@ -292,14 +292,12 @@ one = ''' Service Account Secret "{{.Name}}" created successfully Client ID: {{.ClientID}} -Client Secret: {{.ClientSecret}} -Make a copy of the client ID and secret to store in a safe place. Credentials won't appear again after closing the terminal. +Make a copy of the client ID to store in a safe place. Credentials won't appear again after closing the terminal. -Execute the following command to grant access to the service-account using rhoas cli - -rhoas kafka acl grant-access --producer --consumer --service-account {{.ClientID}} --topic "*" --group "*" +Execute the following command to grant access to the service account using rhoas cli: + $ rhoas kafka acl grant-access --producer --consumer --service-account {{.ClientID}} --topic "*" --group "*" ''' [cluster.kubernetes.createTokenSecret.log.info.createFailed]