Add support for single token #404
Merged
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
- token validation now works with only 1 apiToken - if only the apiToken is provided, a copy of the token is saved in the paasToken field of the secret
0sewa0
reviewed
Dec 6, 2021
chrismuellner
requested changes
Dec 20, 2021
| return dtc, updateCR, nil | ||
| } | ||
|
|
||
| func (r *DynatraceClientReconciler) getTokensFromSecret(ctx context.Context, instance *dynatracev1beta1.DynaKube) (*corev1.Secret, error) { |
There was a problem hiding this comment.
this doesn't only get the tokens from the secret
maybe splitting this into loading the secret and then assigning the tokens in a separate stuff would improve readability here
| @@ -36,8 +36,6 @@ func TestReconcileDynatraceClient_TokenValidation(t *testing.T) { | |||
| rec := &DynatraceClientReconciler{ | |||
| Client: c, | |||
| DynatraceClientFunc: StaticDynatraceClient(dtcMock), | |||
| UpdatePaaSToken: true, | |||
There was a problem hiding this comment.
this could use a test to make sure the apiToken is used when the paasToken is missing
| func TestReconcile_RemoveRoutingIfDisabled(t *testing.T) { | ||
| mockClient := &dtclient.MockDynatraceClient{} | ||
| // replacing is possible |
There was a problem hiding this comment.
Was just a hint for me during development, will be removed
| @@ -9,6 +9,7 @@ CONNECTION_NAME="" | |||
| CLUSTER_NAME="" | |||
| CLUSTER_NAME_REGEX="^[-_a-zA-Z0-9][-_\.a-zA-Z0-9]*$" | |||
| CLUSTER_NAME_LENGTH=256 | |||
| USES_API_AS_PAAS_TOKEN=false | |||
There was a problem hiding this comment.
I don't think the install.sh needs to be updated, but having it can't hurt...
- If there is only one token then only one condition field of dynakube should be used - ApiToken in secret should not be copied
0sewa0
approved these changes
Jan 4, 2022
chrismuellner
approved these changes
Jan 4, 2022
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.
If the apiToken has the scope "InstallerDownload" and "DataExport", the paas token can be omitted