Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump legacy CLI version to 4.12.1 #159

Merged
merged 3 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PHP_VERSION = 8.2.13
LEGACY_CLI_VERSION = 4.11.5
PHP_VERSION = 8.2.14
LEGACY_CLI_VERSION = 4.12.1

GORELEASER_ID ?= platform

Expand Down
6 changes: 3 additions & 3 deletions internal/config/platformsh-cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ api:
auth_url: 'https://auth.api.platform.sh'
oauth2_client_id: 'platform-cli'

ssh_domain_wildcards: ['*.platform.sh']

invitations: true
organizations: true
centralized_permissions: true
user_verification: true
metrics: true

vendor_filter: 'platformsh'

ssh:
domain_wildcards: ['*.platform.sh']

detection:
git_remote_name: 'platform'
git_domain: 'platform.sh' # matches git.eu-5.platform.sh, etc.
Expand Down
5 changes: 3 additions & 2 deletions internal/config/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ type Config struct {
OAuth2RevokeURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_revoke_url"` // e.g. "https://auth.api.platform.sh/oauth2/revoke"
OAuth2TokenURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"oauth2_token_url"` // e.g. "https://auth.api.platform.sh/oauth2/token"
CertifierURL string `validate:"required_without=AuthURL,omitempty,url" yaml:"certifier_url"` // e.g. "https://ssh.api.platform.sh"

SSHDomainWildcards []string `validate:"required" yaml:"ssh_domain_wildcards"` // e.g. ["*.platform.sh"]
} `validate:"required,dive"`
Detection struct {
GitRemoteName string `validate:"required" yaml:"git_remote_name"` // e.g. "platform"
Expand All @@ -60,6 +58,9 @@ type Config struct {
ConsoleURL string `validate:"omitempty,url" yaml:"console_url"` // e.g. "https://console.platform.sh"
DocsURL string `validate:"omitempty,url" yaml:"docs_url"` // e.g. "https://docs.platform.sh"
} `validate:"required,dive"`
SSH struct {
DomainWildcards []string `validate:"required" yaml:"domain_wildcards"` // e.g. ["*.platform.sh"]
} `validate:"required,dive"`
}

// applyDefaults applies defaults to config before parsing.
Expand Down
6 changes: 3 additions & 3 deletions internal/config/test-data/valid-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ api:
base_url: 'https://api.example.com'
auth_url: 'https://auth.example.com'

ssh_domain_wildcards: ['*.example.com']

centralized_permissions: true
invitations: true
metrics: true
organizations: true
user_verification: true

ssh:
domain_wildcards: ['*.example.com']

detection:
git_remote_name: 'example'
git_domain: 'example.com'
Expand Down
6 changes: 3 additions & 3 deletions internal/config/upsun-cli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ api:
auth_url: "https://auth.upsun.com"
oauth2_client_id: "upsun-cli"

ssh_domain_wildcards: ["*.platform.sh", "*.upsun.com"]

invitations: true
organizations: true
centralized_permissions: true
user_verification: true
Expand All @@ -68,6 +65,9 @@ api:

vendor_filter: upsun

ssh:
domain_wildcards: ["*.platform.sh", "*.upsun.com"]

detection:
git_remote_name: "upsun"
git_domain: "upsun.com"
Expand Down