chore(logs): sdk migration #1444
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import ( | |
| "context" | ||
| "fmt" | ||
|
|
||
| logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api" | ||
|
|
||
| "github.com/stackitcloud/stackit-cli/internal/pkg/flags" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/types" | ||
|
|
@@ -58,7 +58,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { | |
| } | ||
|
|
||
| // Get the display name for confirmation | ||
| accessTokenLabel, err := logUtils.GetAccessTokenName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) | ||
| if err != nil { | ||
| params.Printer.Debug(print.ErrorLevel, "get access token: %v", err) | ||
| } | ||
|
|
@@ -113,5 +113,5 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu | |
| } | ||
|
|
||
| func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiDeleteAccessTokenRequest { | ||
| return apiClient.DefaultAPI.DeleteAccessToken(ctx, model.ProjectId, model.Region, model.InstanceId, model.AccessTokenId) | ||
| } | ||
This file contains hidden or 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 | ||||
|---|---|---|---|---|---|---|
|
|
@@ -10,7 +10,7 @@ import ( | |||||
| "github.com/google/go-cmp/cmp" | ||||||
| "github.com/google/go-cmp/cmp/cmpopts" | ||||||
| "github.com/google/uuid" | ||||||
| logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api" | ||||||
| ) | ||||||
|
|
||||||
| const ( | ||||||
|
|
@@ -21,7 +21,7 @@ type testCtxKey struct{} | |||||
|
|
||||||
| var ( | ||||||
| testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") | ||||||
| testClient = &logs.APIClient{DefaultAPI: &logs.DefaultAPIService{}} | ||||||
|
|
||||||
| testProjectId = uuid.NewString() | ||||||
| testInstanceId = uuid.NewString() | ||||||
|
|
@@ -69,7 +69,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { | |||||
| } | ||||||
|
|
||||||
| func fixtureRequest(mods ...func(request *logs.ApiDeleteAccessTokenRequest)) logs.ApiDeleteAccessTokenRequest { | ||||||
| request := testClient.DefaultAPI.DeleteAccessToken(testCtx, testProjectId, testRegion, testInstanceId, testAccessTokenId) | ||||||
| for _, mod := range mods { | ||||||
| mod(&request) | ||||||
| } | ||||||
|
|
@@ -197,7 +197,7 @@ func TestBuildRequest(t *testing.T) { | |||||
|
|
||||||
| diff := cmp.Diff(request, tt.expectedRequest, | ||||||
| cmp.AllowUnexported(tt.expectedRequest), | ||||||
| cmpopts.EquateComparable(testCtx, tt.expectedRequest), | ||||||
|
Member
There was a problem hiding this comment. why is that change needed? 😅
Member
There was a problem hiding this comment. I guess it's the same as above, the thing you aim to do should look like this
Suggested change
|
||||||
| ) | ||||||
| if diff != "" { | ||||||
| t.Fatalf("Data does not match: %s", diff) | ||||||
|
|
||||||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -4,19 +4,17 @@ import ( | |
| "context" | ||
| "fmt" | ||
|
|
||
| logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api" | ||
|
|
||
| "github.com/stackitcloud/stackit-cli/internal/pkg/args" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/errors" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/examples" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/flags" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/print" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/client" | ||
| logUtils "github.com/stackitcloud/stackit-cli/internal/pkg/services/logs/utils" | ||
| "github.com/stackitcloud/stackit-cli/internal/pkg/types" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
@@ -55,7 +53,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { | |
| return err | ||
| } | ||
|
|
||
| instanceLabel, err := logUtils.GetInstanceName(ctx, apiClient.DefaultAPI, model.ProjectId, model.Region, model.InstanceId) | ||
| if err != nil { | ||
| params.Printer.Debug(print.ErrorLevel, "get instance name: %v", err) | ||
| instanceLabel = model.InstanceId | ||
|
|
@@ -77,7 +75,7 @@ func NewCmd(params *types.CmdParams) *cobra.Command { | |
| return fmt.Errorf("delete all access token: nil result") | ||
| } | ||
|
|
||
| params.Printer.Outputf("Deleted %d access token(s)\n", len(items.Tokens)) | ||
| return nil | ||
| }, | ||
| } | ||
|
|
@@ -108,5 +106,5 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel, | |
| } | ||
|
|
||
| func buildRequest(ctx context.Context, model *inputModel, apiClient *logs.APIClient) logs.ApiDeleteAllAccessTokensRequest { | ||
| return apiClient.DefaultAPI.DeleteAllAccessTokens(ctx, model.ProjectId, model.Region, model.InstanceId) | ||
| } | ||
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ import ( | |
| "github.com/google/go-cmp/cmp" | ||
| "github.com/google/go-cmp/cmp/cmpopts" | ||
| "github.com/google/uuid" | ||
| logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -21,7 +21,7 @@ type testCtxKey struct{} | |
|
|
||
| var ( | ||
| testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo") | ||
| testClient = &logs.APIClient{DefaultAPI: &logs.DefaultAPIService{}} | ||
|
|
||
| testProjectId = uuid.NewString() | ||
| testInstanceId = uuid.NewString() | ||
|
|
@@ -57,7 +57,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { | |
| } | ||
|
|
||
| func fixtureRequest(mods ...func(request *logs.ApiDeleteAllAccessTokensRequest)) logs.ApiDeleteAllAccessTokensRequest { | ||
| request := testClient.DefaultAPI.DeleteAllAccessTokens(testCtx, testProjectId, testRegion, testInstanceId) | ||
| for _, mod := range mods { | ||
| mod(&request) | ||
| } | ||
|
|
@@ -153,7 +153,7 @@ func TestBuildRequest(t *testing.T) { | |
|
|
||
| diff := cmp.Diff(request, tt.expectedRequest, | ||
| cmp.AllowUnexported(tt.expectedRequest), | ||
| cmpopts.EquateComparable(testCtx, tt.expectedRequest), | ||
|
|
||
| ) | ||
| if diff != "" { | ||
| t.Fatalf("Data does not match: %s", diff) | ||
|
|
||
Oops, something went wrong.
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.
I suggest you copy that map function to our CLI (if not already present, pls check): https://github.com/stackitcloud/terraform-provider-stackit/blob/ffa60e66b90353ccdc074632a90c76bc3fe9cb0a/stackit/internal/utils/utils.go#L222-L229
Then it's just an inline call which is needed, see below