Implement Galadriel Server Admin CLI - GLCP-39474 #164
Conversation
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
mgbcaio
requested review from
wibarre,
mchurichi,
jufantozzi,
maxlambrecht and
Victorblsilveira
as code owners
cmd/server/util/client.go
Outdated
| return nil, fmt.Errorf(errReadResponseBody, err) | ||
| } | ||
|
|
||
| if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusCreated { |
There was a problem hiding this comment.
this should be at the beginning of the function and return early if the statuscode is not success.
cmd/server/util/client.go
Outdated
| return relationship, nil | ||
| } | ||
|
|
||
| func readBodyAndStatusCode(res *http.Response) ([]byte, error) { |
There was a problem hiding this comment.
rename to readResponse
cmd/server/cli/list.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| // Use: "trustdomains", |
There was a problem hiding this comment.
remove all the commented code
pkg/server/endpoints/admin.go
Outdated
| @@ -288,7 +291,7 @@ func (h *AdminAPIHandlers) GetJoinToken(echoCtx echo.Context, trustDomainName ap | |||
| } | |||
|
|
|||
| if td == nil { | |||
| errMsg := fmt.Errorf("trust domain exists: %q", trustDomainName) | |||
| errMsg := fmt.Errorf("trust domain '%s' does not exists", trustDomainName) | |||
There was a problem hiding this comment.
use %q for quoted strings
pkg/server/endpoints/admin_test.go
Outdated
| @@ -483,7 +483,7 @@ func TestUDSGetJoinToken(t *testing.T) { | |||
| echoHttpErr := err.(*echo.HTTPError) | |||
| assert.Equal(t, http.StatusBadRequest, echoHttpErr.Code) | |||
|
|
|||
| expectedMsg := fmt.Errorf("trust domain exists: %q", td1) | |||
| expectedMsg := fmt.Errorf("trust domain '%s' does not exists", td1) | |||
There was a problem hiding this comment.
use %q for quoted strings
pkg/server/endpoints/admin.go
Outdated
| if err != nil { | ||
| msg := errors.New("error looking up trust domain") | ||
| errMsg := fmt.Errorf("%s: %w", msg, err) | ||
| return nil, h.handleAndLog(errMsg, http.StatusInternalServerError) | ||
| } | ||
|
|
||
| if td == nil { | ||
| errMsg := fmt.Errorf("trust domain exists: %q", trustDomainID) | ||
| errMsg := fmt.Errorf("trust domain does not exists") |
There was a problem hiding this comment.
Suggested change
| errMsg := fmt.Errorf("trust domain does not exists") | |
| errMsg := fmt.Errorf("trust domain %q does not exists", tdName.String()) |
pkg/server/endpoints/admin.go
Outdated
| func (h *AdminAPIHandlers) lookupTrustDomain(ctx context.Context, trustDomainID uuid.UUID, code int) (*entity.TrustDomain, error) { | ||
| td, err := h.Datastore.FindTrustDomainByID(ctx, trustDomainID) | ||
| func (h *AdminAPIHandlers) lookupTrustDomain(ctx context.Context, trustDomainName api.TrustDomainName, code int) (*entity.TrustDomain, error) { | ||
| tdName := spiffeid.RequireTrustDomainFromString(trustDomainName) |
There was a problem hiding this comment.
don't use RequireTrustDomainFromString, it's a method for testing, it panics instead of returning an error.
pkg/server/api/admin/helper.go
Outdated
| @@ -9,8 +9,8 @@ import ( | |||
|
|
|||
| func (r RelationshipRequest) ToEntity() *entity.Relationship { | |||
| return &entity.Relationship{ | |||
| TrustDomainAID: r.TrustDomainAId, | |||
| TrustDomainBID: r.TrustDomainBId, | |||
| TrustDomainAName: spiffeid.RequireTrustDomainFromString(r.TrustDomainAName), | |||
There was a problem hiding this comment.
don't use RequireTrustDomainFromString
pkg/server/api/admin/helper.go
Outdated
| TrustDomainAID: r.TrustDomainAId, | ||
| TrustDomainBID: r.TrustDomainBId, | ||
| TrustDomainAName: spiffeid.RequireTrustDomainFromString(r.TrustDomainAName), | ||
| TrustDomainBName: spiffeid.RequireTrustDomainFromString(r.TrustDomainBName), |
|
Kudos, SonarCloud Quality Gate passed!
|
maxlambrecht
approved these changes
May 22, 2023
There was a problem hiding this comment.
Thanks @mgbcaio!
The rest of the tests and the CLI implementation will be added in a separate PR.
Approving.
maxlambrecht
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull request check list
Affected functionality
Galadriel Server CLI:
generate token,create trustdomainandcreate relationshipDescription of change
The galadriel Server CLI now uses the Admin API, through the
admin.Client, to perform the requests regarding Trust Domains, Relationships and Join Tokens.WIP: List trust domains and relationships.
Renaming
management.goandmanagement_test.go->admin.goandadmin_test.goSome changes to
admin.yamlthat were kinda of when implementing the CLI to use the generated codeSome bug fixing regarding the CLI usage and output of the functions.
Which issue this pull requests fixes
GLCP-39474