Add end to end logics for ACS, Service Registry, Gateway and API portal#4282
Merged
zhoxing-ms merged 12 commits intoAzure:mainfrom Jan 6, 2022
Merged
Add end to end logics for ACS, Service Registry, Gateway and API portal#4282zhoxing-ms merged 12 commits intoAzure:mainfrom
zhoxing-ms merged 12 commits intoAzure:mainfrom
Conversation
Collaborator
|
spring cloud |
zhoxing-ms
reviewed
Jan 4, 2022
zhoxing-ms
reviewed
Jan 4, 2022
zhoxing-ms
reviewed
Jan 4, 2022
| c.argument('host_key', help='Host key of the added config.') | ||
| c.argument('host_key_algorithm', help='Host key algorithm of the added config.') | ||
| c.argument('private_key', help='Private_key of the added config.') | ||
| c.argument('host_key_check', help='Strict_host_key_checking of the added config.') |
Contributor
There was a problem hiding this comment.
Could you please explain Strict_host_key_checking more specifically?
zhoxing-ms
reviewed
Jan 4, 2022
|
|
||
| def validate_routes(namespace): | ||
| if namespace.routes_json is not None and namespace.routes_file is not None: | ||
| raise ValidationError("You can only specify either --routes-json or --routes-file.") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type MutuallyExclusiveArgumentError
Contributor
Author
There was a problem hiding this comment.
Updated all error types
zhoxing-ms
reviewed
Jan 4, 2022
| def validate_gateway_instance_count(namespace): | ||
| if namespace.gateway_instance_count is not None: | ||
| if namespace.gateway_instance_count < 1: | ||
| raise ValidationError("--gateway-instance-count must be greater than 0") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type InvalidArgumentValueError
zhoxing-ms
reviewed
Jan 4, 2022
| def validate_api_portal_instance_count(namespace): | ||
| if namespace.api_portal_instance_count is not None: | ||
| if namespace.api_portal_instance_count < 1: | ||
| raise ValidationError("--api-portal-instance-count must be greater than 0") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type InvalidArgumentValueError
zhoxing-ms
reviewed
Jan 4, 2022
| all_provided = namespace.scope and namespace.client_id and namespace.client_secret and namespace.issuer_uri | ||
| none_provided = namespace.scope is None and namespace.client_id is None and namespace.client_secret is None and namespace.issuer_uri is None | ||
| if not all_provided and not none_provided: | ||
| raise ValidationError("Single Sign On configurations '--scope --client-id --client-secret --issuer-uri' should be all provided or none provided.") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type ArgumentUsageError
zhoxing-ms
reviewed
Jan 4, 2022
| def validate_git_uri(namespace): | ||
| uri = namespace.uri | ||
| if uri and (not uri.startswith("https://")) and (not uri.startswith("git@")): | ||
| raise ValidationError("Git URI should start with \"https://\" or \"git@\"") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type InvalidArgumentValueError
zhoxing-ms
reviewed
Jan 4, 2022
| invalid_list = [p for p in pattern_list if not _is_valid_pattern(p)] | ||
| if len(invalid_list) > 0: | ||
| logger.warning("Patterns '%s' are invalid.", ','.join(invalid_list)) | ||
| raise ValidationError("Patterns should be the collection of patterns separated by comma, each pattern in the format of 'application' or 'application/profile'") |
Contributor
There was a problem hiding this comment.
Please use the more specific error type InvalidArgumentValueError
zhoxing-ms
reviewed
Jan 4, 2022
Co-authored-by: Xing Zhou <Zhou.Xing@microsoft.com>
Co-authored-by: Xing Zhou <Zhou.Xing@microsoft.com>
Contributor
Author
zhoxing-ms
reviewed
Jan 5, 2022
zhoxing-ms
reviewed
Jan 5, 2022
Comment on lines
+479
to
+489
| for scope in ['spring-cloud gateway custom-domain', | ||
| 'spring-cloud api-portal custom-domain']: | ||
| with self.argument_context(scope) as c: | ||
| c.argument('domain_name', help='Name of custom domain.') | ||
|
|
||
| for scope in ['spring-cloud gateway custom-domain bind', | ||
| 'spring-cloud gateway custom-domain update', | ||
| 'spring-cloud api-portal custom-domain bind', | ||
| 'spring-cloud api-portal custom-domain update']: | ||
| with self.argument_context(scope) as c: | ||
| c.argument('certificate', type=str, help='Certificate name in Azure Spring Cloud.') |
Co-authored-by: Xing Zhou <Zhou.Xing@microsoft.com>
wangzelin007
approved these changes
Jan 5, 2022
zhoxing-ms
reviewed
Jan 6, 2022
| c.argument('host_key', help='Host key of the added config.') | ||
| c.argument('host_key_algorithm', help='Host key algorithm of the added config.') | ||
| c.argument('private_key', help='Private_key of the added config.') | ||
| c.argument('host_key_check', help='Strict_host_key_checking of the added config. If false, ignore errors with host key.') |
Contributor
There was a problem hiding this comment.
Could you replace Strict_host_key_checking with a more understandable description
Contributor
Author
There was a problem hiding this comment.
Updated, the concept is used in SSH authentication of Configuration Service.
zhoxing-ms
approved these changes
Jan 6, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The pr is part of main...VSChina:enterprise.
Add end to end logics for 4 Tanzu components: ACS, Service Registry, Gateway and API portal. Including commands, params, help, transformers and validator.
General Guidelines
azdev style <YOUR_EXT>locally? (pip install azdevrequired)python scripts/ci/test_index.py -qlocally?For new extensions:
About Extension Publish
There is a pipeline to automatically build, upload and publish extension wheels.
Once your PR is merged into master branch, a new PR will be created to update
src/index.jsonautomatically.The precondition is to put your code inside this repo and upgrade the version in the PR but do not modify
src/index.json.