"rad credential register aws" command changes for irsa #7750
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| Copyright 2023 The Radius Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package accesskey | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| v1 "github.com/radius-project/radius/pkg/armrpc/api/v1" | ||
| "github.com/radius-project/radius/pkg/cli" | ||
| "github.com/radius-project/radius/pkg/cli/clierrors" | ||
| "github.com/radius-project/radius/pkg/cli/cmd/commonflags" | ||
| "github.com/radius-project/radius/pkg/cli/cmd/credential/common" | ||
| "github.com/radius-project/radius/pkg/cli/connections" | ||
| cli_credential "github.com/radius-project/radius/pkg/cli/credential" | ||
| "github.com/radius-project/radius/pkg/cli/framework" | ||
| "github.com/radius-project/radius/pkg/cli/output" | ||
| "github.com/radius-project/radius/pkg/cli/workspaces" | ||
| "github.com/radius-project/radius/pkg/to" | ||
| ucp "github.com/radius-project/radius/pkg/ucp/api/v20231001preview" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func NewCommand(factory framework.Factory) (*cobra.Command, framework.Runner) { | ||
| runner := NewRunner(factory) | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "access-key", | ||
| Short: "Register (Add or update) AWS cloud provider credential for a Radius installation.", | ||
| Long: `Register (Add or update) AWS cloud provider credential for a Radius installation.. | ||
|
|
||
| This command is intended for scripting or advanced use-cases. See 'rad init' for a user-friendly way | ||
| to configure these settings. | ||
|
|
||
| Radius will use the provided IAM credential for all interactions with AWS. | ||
| ` + common.LongDescriptionBlurb, | ||
| Example: ` | ||
| # Register (Add or update) cloud provider credential for AWS with IAM authentication | ||
| rad credential register aws access-key --access-key-id <access-key-id> --secret-access-key <secret-access-key> | ||
| `, | ||
| Args: cobra.ExactArgs(0), | ||
| RunE: framework.RunCommand(runner), | ||
| } | ||
|
|
||
| commonflags.AddOutputFlag(cmd) | ||
| commonflags.AddWorkspaceFlag(cmd) | ||
|
|
||
| cmd.Flags().String("access-key-id", "", "The AWS IAM access key id.") | ||
| _ = cmd.MarkFlagRequired("access-key-id") | ||
|
|
||
| cmd.Flags().String("secret-access-key", "", "The AWS IAM secret access key.") | ||
| _ = cmd.MarkFlagRequired("secret-access-key") | ||
|
|
||
| return cmd, runner | ||
| } | ||
|
|
||
| // Runner is the runner implementation for the `rad credential register aws` command. | ||
| type Runner struct { | ||
| ConfigHolder *framework.ConfigHolder | ||
| ConnectionFactory connections.Factory | ||
| Output output.Interface | ||
| Format string | ||
| Workspace *workspaces.Workspace | ||
|
|
||
| AccessKeyID string | ||
| SecretAccessKey string | ||
| KubeContext string | ||
| } | ||
|
|
||
| // NewRunner creates a new instance of the `rad credential register aws` runner. | ||
| func NewRunner(factory framework.Factory) *Runner { | ||
| return &Runner{ | ||
| ConfigHolder: factory.GetConfigHolder(), | ||
| ConnectionFactory: factory.GetConnectionFactory(), | ||
| Output: factory.GetOutput(), | ||
| } | ||
| } | ||
|
|
||
| // Validate runs validation for the `rad credential register aws` command. | ||
| // | ||
|
|
||
| // Validate() checks if the required workspace, output format, access key ID and secret access key are present, and if not, returns an error. | ||
| func (r *Runner) Validate(cmd *cobra.Command, args []string) error { | ||
| workspace, err := cli.RequireWorkspace(cmd, r.ConfigHolder.Config, r.ConfigHolder.DirectoryConfig) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| r.Workspace = workspace | ||
|
|
||
| format, err := cli.RequireOutput(cmd) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| r.Format = format | ||
|
|
||
| accessKeyID, err := cmd.Flags().GetString("access-key-id") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| secretAccessKey, err := cmd.Flags().GetString("secret-access-key") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| r.AccessKeyID = accessKeyID | ||
| r.SecretAccessKey = secretAccessKey | ||
|
|
||
| if r.AccessKeyID == "" { | ||
| return clierrors.Message("Access Key id %q cannot be empty.", r.AccessKeyID) | ||
| } | ||
| if r.SecretAccessKey == "" { | ||
| return clierrors.Message("Secret Access Key %q cannot be empty.", r.SecretAccessKey) | ||
| } | ||
|
|
||
| kubeContext, ok := r.Workspace.KubernetesContext() | ||
| if !ok { | ||
| return clierrors.Message("A Kubernetes connection is required.") | ||
| } | ||
| r.KubeContext = kubeContext | ||
| return nil | ||
| } | ||
|
|
||
| // Run runs the `rad credential register aws access-key` command. | ||
| // | ||
|
|
||
| // Run registers an AWS credential with the given context and workspace, and returns an error if unsuccessful. | ||
| func (r *Runner) Run(ctx context.Context) error { | ||
| r.Output.LogInfo("Registering credential for %q cloud provider in Radius installation %q...", "aws", r.Workspace.FmtConnection()) | ||
| client, err := r.ConnectionFactory.CreateCredentialManagementClient(ctx, *r.Workspace) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| credential := ucp.AwsCredentialResource{ | ||
|
There was a problem hiding this comment. nit: extra line before this |
||
| Location: to.Ptr(v1.LocationGlobal), | ||
| Type: to.Ptr(cli_credential.AWSCredential), | ||
| Properties: &ucp.AwsAccessKeyCredentialProperties{ | ||
| Storage: &ucp.CredentialStorageProperties{ | ||
| Kind: to.Ptr(ucp.CredentialStorageKindInternal), | ||
| }, | ||
| AccessKeyID: &r.AccessKeyID, | ||
| SecretAccessKey: &r.SecretAccessKey, | ||
| }, | ||
| } | ||
|
|
||
| err = client.PutAWS(ctx, credential) | ||
|
There was a problem hiding this comment. if we have access key credential configured, and run rad credential register, then we would just overwrite it, since we store exactly one credential which is "default" correct? |
||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| r.Output.LogInfo("Successfully registered credential for %q cloud provider. Tokens may take up to 30 seconds to refresh.", "aws") | ||
|
|
||
| return nil | ||
| } | ||
|
There was a problem hiding this comment. Do we need to add any other tests here? There was a problem hiding this comment. we havent changed anything for the access-key type. the tests were copied from the previously added tests. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we need to print the empty
AccessKeyandAccessKeyIDhere? I mean why do we need%qhere?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the exisitng code for access-key type. we moved it to different file