diff --git a/app/namespace.go b/app/namespace.go index 5ca93909..5d13b32c 100644 --- a/app/namespace.go +++ b/app/namespace.go @@ -804,9 +804,9 @@ func NewNamespaceCommand(getNamespaceClientFn GetNamespaceClientFn) (CommandOut, Required: true, }, &cli.StringFlag{ - Name: cloudProviderFlagName, - Usage: "The cloud provider of the region. Default: aws", - Value: CloudProviderAWS, + Name: cloudProviderFlagName, + Usage: "The cloud provider of the region.", + Required: true, }, }, Action: func(ctx *cli.Context) error { @@ -831,9 +831,9 @@ func NewNamespaceCommand(getNamespaceClientFn GetNamespaceClientFn) (CommandOut, Required: true, }, &cli.StringFlag{ - Name: cloudProviderFlagName, - Usage: "The cloud provider of the region. Default: aws", - Value: CloudProviderAWS, + Name: cloudProviderFlagName, + Usage: "The cloud provider of the region.", + Required: true, }, }, Action: func(ctx *cli.Context) error { @@ -1673,9 +1673,9 @@ func NewNamespaceCommand(getNamespaceClientFn GetNamespaceClientFn) (CommandOut, Required: true, }, &cli.StringFlag{ - Name: cloudProviderFlagName, - Usage: "The cloud provider of the region. Default: aws", - Value: CloudProviderAWS, + Name: cloudProviderFlagName, + Usage: "The cloud provider of the region.", + Required: true, }, }, Action: func(ctx *cli.Context) error { diff --git a/app/namespace_test.go b/app/namespace_test.go index ab4c86c6..6f8d0bd7 100644 --- a/app/namespace_test.go +++ b/app/namespace_test.go @@ -1793,10 +1793,10 @@ func (s *NamespaceTestSuite) TestCreate() { s.Error(s.RunCmd("namespace", "create")) s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1")) s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2")) - s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--auth-method", "api_key_or_mtls")) - s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--auth-method", "invalid")) + s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--cloud-provider", "aws", "--auth-method", "api_key_or_mtls")) + s.Error(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--cloud-provider", "aws", "--auth-method", "invalid")) s.mockService.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(nil, errors.New("create namespace error")).Times(1) - s.EqualError(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--ca-certificate", "cert1"), "create namespace error") + s.EqualError(s.RunCmd("namespace", "create", "--namespace", "ns1", "--region", "us-west-2", "--cloud-provider", "aws", "--ca-certificate", "cert1"), "create namespace error") s.mockService.EXPECT().CreateNamespace(gomock.Any(), gomock.Any()).Return(&namespaceservice.CreateNamespaceResponse{ RequestStatus: &request.RequestStatus{}, }, nil).AnyTimes() @@ -1812,6 +1812,7 @@ func (s *NamespaceTestSuite) TestCreate() { "namespace", "create", "--namespace", "ns1", "--region", "us-west-2", + "--cloud-provider", "aws", "--ca-certificate", "cert1", "--certificate-filter-input", "{ \"filters\": [ { \"commonName\": \"test1\" } ] }", "--search-attribute", "testsearchattribute=Keyword", @@ -1821,6 +1822,7 @@ func (s *NamespaceTestSuite) TestCreate() { "namespace", "create", "--namespace", "ns1", "--region", "us-west-2", + "--cloud-provider", "aws", "--auth-method", "api_key", "--search-attribute", "testsearchattribute=Keyword", "--user-namespace-permission", "testuser@testcompany.com=Read", @@ -1843,6 +1845,7 @@ func (s *NamespaceTestSuite) TestCreateWithCodec() { "namespace", "create", "--namespace", "ns1", "--region", "us-west-2", + "--cloud-provider", "aws", "--ca-certificate", "cert1", "--certificate-filter-input", "{ \"filters\": [ { \"commonName\": \"test1\" } ] }", "--search-attribute", "testsearchattribute=Keyword", @@ -1854,6 +1857,7 @@ func (s *NamespaceTestSuite) TestCreateWithCodec() { "namespace", "create", "--namespace", "ns1", "--region", "us-west-2", + "--cloud-provider", "aws", "--ca-certificate", "cert1", "--certificate-filter-input", "{ \"filters\": [ { \"commonName\": \"test1\" } ] }", "--search-attribute", "testsearchattribute=Keyword", @@ -1867,6 +1871,7 @@ func (s *NamespaceTestSuite) TestCreateWithCodec() { "namespace", "create", "--namespace", "ns1", "--region", "us-west-2", + "--cloud-provider", "aws", "--ca-certificate", "cert1", "--certificate-filter-input", "{ \"filters\": [ { \"commonName\": \"test1\" } ] }", "--search-attribute", "testsearchattribute=Keyword", @@ -2754,8 +2759,8 @@ func (s *NamespaceTestSuite) TestRemoveNamespaceRegion() { expectErr bool }{ { - name: "Validate default cloud provider", - args: []string{"namespace", "delete-region", "--namespace", ns, "--region", "us-west-2"}, + name: "Validate AWS cloud provider", + args: []string{"namespace", "delete-region", "--namespace", ns, "--region", "us-west-2", "--cloud-provider", "aws"}, expectRequest: func(r *cloudservice.DeleteNamespaceRegionRequest) { r.Namespace = ns r.Region = "aws-us-west-2" diff --git a/app/version.go b/app/version.go index 439c1916..d7b5847e 100644 --- a/app/version.go +++ b/app/version.go @@ -19,7 +19,7 @@ const ( // MinSupportedVersion is the minimum tcld version supported by our APIs. // This string must be updated when we deprecate older versions, but should be // done carefully as this will likely break user's current usage of tcld. - MinSupportedVersion = "v0.17.0" + MinSupportedVersion = "v0.22.0" // DefaultVersionString is the version which is sent over if no version was available. // This can happen if a user builds the latest main branch, as the version string provided