Support role bootstrapping in OSS #7130
Closed
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
fspmarshall
requested review from
klizhentas,
r0mant and
russjones
as code owners
fspmarshall
force-pushed
the
fspmarshall/bootstrap-roles-oss
branch
from
2e9ceed to
bb676af
Compare
|
@fspmarshall I had a play around with this and it does not appear to be working with roles and the GH provider defined in the bootstrap files. I am seeing a similar problem to #7134 where it creates the migrated |
|
@fspmarshall Is this ready to review? |
russjones
added
the
good-starter-issue
codingllama
reviewed
Dec 1, 2021
| @@ -418,6 +418,25 @@ func init() { | |||
| return rsc, nil | |||
| }) | |||
|
|
|||
| RegisterResourceMarshaler(KindRole, func(r Resource, opts ...MarshalOption) ([]byte, error) { | |||
| rsc, ok := r.(Role) | |||
There was a problem hiding this comment.
Maybe:
Suggested change
| rsc, ok := r.(Role) | |
| role, ok := r.(Role) |
| return raw, nil | ||
| }) | ||
| RegisterResourceUnmarshaler(KindRole, func(b []byte, opts ...MarshalOption) (Resource, error) { | ||
| rsc, err := UnmarshalRole(b, opts...) |
There was a problem hiding this comment.
Maybe (as above):
Suggested change
| rsc, err := UnmarshalRole(b, opts...) | |
| role, err := UnmarshalRole(b, opts...) |
Comment on lines
+53
to
+54
| err = ioutil.WriteFile(bootstrapFile, []byte(YAMLBootstrap), 0660) | ||
| require.NoError(t, err) |
There was a problem hiding this comment.
Suggested change
| err = ioutil.WriteFile(bootstrapFile, []byte(YAMLBootstrap), 0660) | |
| require.NoError(t, err) | |
| require.NoError(t, ioutil.WriteFile(bootstrapFile, []byte(YAMLBootstrap), 0660)) |
| require.Equal(t, "start", cmd) | ||
| require.Equal(t, 2, len(conf.Auth.Resources)) | ||
| require.Equal(t, "github", conf.Auth.Resources[0].GetKind()) | ||
| require.Equal(t, "role", conf.Auth.Resources[1].GetKind()) |
There was a problem hiding this comment.
Should we do a deeper assertion at the resources or is this enough? (If yes, please leave a comment stating why.)
|
Replaced by #11175. |
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.
Adds support for roles in the OSS variant of the
--bootstrapflag. Supersedes #7036.