-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat(env): Add list cmd * update environment status field * update: meroxa-go and use of UUID * chore: updated to upstream meroxa-go
- Loading branch information
Showing
11 changed files
with
434 additions
and
16 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -634,7 +634,7 @@ func buildCommandWithFeatureFlag(cmd *cobra.Command, c Command) { | |
| userFeatureFlags := global.Config.GetStringSlice(global.UserFeatureFlagsEnv) | ||
|
|
||
| if !hasFeatureFlag(userFeatureFlags, flagRequired) { | ||
| return fmt.Errorf("your account does not have access to the %q feature."+ | ||
| return fmt.Errorf("your account does not have access to the %q feature. "+ | ||
| "Reach out to [email protected] for more information", flagRequired) | ||
| } | ||
|
|
||
|
|
||
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,84 @@ | ||
| /* | ||
| Copyright © 2021 Meroxa Inc | ||
| 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 environments | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/meroxa/cli/cmd/meroxa/builder" | ||
| "github.com/meroxa/cli/log" | ||
| "github.com/meroxa/cli/utils" | ||
| "github.com/meroxa/meroxa-go" | ||
| ) | ||
|
|
||
| var ( | ||
| _ builder.CommandWithDocs = (*List)(nil) | ||
| _ builder.CommandWithClient = (*List)(nil) | ||
| _ builder.CommandWithLogger = (*List)(nil) | ||
| _ builder.CommandWithExecute = (*List)(nil) | ||
| _ builder.CommandWithAliases = (*List)(nil) | ||
| _ builder.CommandWithNoHeaders = (*List)(nil) | ||
| ) | ||
|
|
||
| type listEnvironmentsClient interface { | ||
| ListEnvironments(ctx context.Context) ([]*meroxa.Environment, error) | ||
| } | ||
|
|
||
| type List struct { | ||
| client listEnvironmentsClient | ||
| logger log.Logger | ||
| hideHeaders bool | ||
| } | ||
|
|
||
| func (l *List) Usage() string { | ||
| return "list" | ||
| } | ||
|
|
||
| func (l *List) Docs() builder.Docs { | ||
| return builder.Docs{ | ||
| Short: "List environments", | ||
| } | ||
| } | ||
|
|
||
| func (l *List) Aliases() []string { | ||
| return []string{"ls"} | ||
| } | ||
|
|
||
| func (l *List) Execute(ctx context.Context) error { | ||
| var err error | ||
| environments, err := l.client.ListEnvironments(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| l.logger.JSON(ctx, environments) | ||
| l.logger.Info(ctx, utils.EnvironmentsTable(environments, l.hideHeaders)) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (l *List) Logger(logger log.Logger) { | ||
| l.logger = logger | ||
| } | ||
|
|
||
| func (l *List) Client(client *meroxa.Client) { | ||
| l.client = client | ||
| } | ||
|
|
||
| func (l *List) HideHeaders(hide bool) { | ||
| l.hideHeaders = hide | ||
| } |
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,90 @@ | ||
| /* | ||
| Copyright © 2021 Meroxa Inc | ||
| 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 environments | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "reflect" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
| "github.com/meroxa/cli/log" | ||
| mock "github.com/meroxa/cli/mock-cmd" | ||
| "github.com/meroxa/cli/utils" | ||
| "github.com/meroxa/meroxa-go" | ||
| ) | ||
|
|
||
| func TestListEnvironmentsExecution(t *testing.T) { | ||
| ctx := context.Background() | ||
| ctrl := gomock.NewController(t) | ||
| client := mock.NewMockListEnvironmentsClient(ctrl) | ||
| logger := log.NewTestLogger() | ||
|
|
||
| ee := &meroxa.Environment{ | ||
| Type: "dedicated", | ||
| Name: "environment-1234", | ||
| Provider: "aws", | ||
| Region: "aws:us-east", | ||
| Status: meroxa.EnvironmentStatus{State: "provisioned"}, | ||
| UUID: "531428f7-4e86-4094-8514-d397d49026f7", | ||
| } | ||
|
|
||
| environments := []*meroxa.Environment{ee} | ||
|
|
||
| client. | ||
| EXPECT(). | ||
| ListEnvironments(ctx). | ||
| Return(environments, nil) | ||
|
|
||
| l := &List{ | ||
| client: client, | ||
| logger: logger, | ||
| } | ||
|
|
||
| err := l.Execute(ctx) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("not expected error, got \"%s\"", err.Error()) | ||
| } | ||
|
|
||
| gotLeveledOutput := logger.LeveledOutput() | ||
| wantLeveledOutput := utils.EnvironmentsTable(environments, false) | ||
|
|
||
| if !strings.Contains(gotLeveledOutput, wantLeveledOutput) { | ||
| t.Fatalf("expected output:\n%s\ngot:\n%s", wantLeveledOutput, gotLeveledOutput) | ||
| } | ||
|
|
||
| gotJSONOutput := logger.JSONOutput() | ||
| var gotEnvironments []meroxa.Environment | ||
| err = json.Unmarshal([]byte(gotJSONOutput), &gotEnvironments) | ||
|
|
||
| var lp []meroxa.Environment | ||
|
|
||
| for _, p := range environments { | ||
| lp = append(lp, *p) | ||
| } | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("not expected error, got %q", err.Error()) | ||
| } | ||
|
|
||
| if !reflect.DeepEqual(gotEnvironments, lp) { | ||
| t.Fatalf("expected \"%v\", got \"%v\"", environments, gotEnvironments) | ||
| } | ||
| } |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.