@@ -11,17 +11,6 @@ import (
1111 "github.com/stretchr/testify/assert"
1212)
1313
14- const (
15- testToken = "my-token"
16- testContextURL = "http://bar.com"
17- urlFlagArg = "--url"
18- testCACertContext = "cacertdata"
19- testAPIPath = "/api"
20- serviceTokenFlagArg = "--service-token"
21- caCertPathFlagArg = "--ca-cert-path"
22- caCertBase64DataFlagArg = "--ca-cert-base64-data"
23- )
24-
2514func setupSaveCmd (t * testing.T ) (* di.MockDeps , * cobra.Command ) {
2615 cli := di .NewMockDeps (t )
2716 cmd := SaveCommand (& cli .Deps )
@@ -40,41 +29,41 @@ func TestSaveContext(t *testing.T) { //nolint:funlen
4029 }{
4130 {
4231 name : "new context" ,
43- args : []string {nameFlagArg , "baz" , urlFlagArg , "http://baz.com" , "--api-token" , testToken },
32+ args : []string {"--name" , "baz" , "--url" , "http://baz.com" , "--api-token" , "my-token" },
4433 expectedContext : config.NamedContext {
4534 Name : "baz" ,
4635 Context : & config.StsContext {
4736 URL : "http://baz.com" ,
48- APIToken : testToken ,
49- APIPath : testAPIPath ,
37+ APIToken : "my-token" ,
38+ APIPath : "/api" ,
5039 },
5140 },
5241 totalContextInConfig : 7 ,
5342 wantErr : false ,
5443 },
5544 {
5645 name : "existing context" ,
57- args : []string {nameFlagArg , testBar , urlFlagArg , testContextURL , serviceTokenFlagArg , testToken },
46+ args : []string {"--name" , "bar" , "--url" , "http://bar.com" , "--service-token" , "my-token" },
5847 expectedContext : config.NamedContext {
59- Name : testBar ,
48+ Name : "bar" ,
6049 Context : & config.StsContext {
61- URL : testContextURL ,
62- ServiceToken : testToken ,
63- APIPath : testAPIPath ,
50+ URL : "http://bar.com" ,
51+ ServiceToken : "my-token" ,
52+ APIPath : "/api" ,
6453 },
6554 },
6655 totalContextInConfig : 6 ,
6756 wantErr : false ,
6857 },
6958 {
7059 name : "existing context ca-cert is set with ca-cert-path" ,
71- args : []string {nameFlagArg , testBar , urlFlagArg , testContextURL , serviceTokenFlagArg , testToken , caCertPathFlagArg , "testdata/selfSignedCert.crt" },
60+ args : []string {"--name" , "bar" , "--url" , "http://bar.com" , "--service-token" , "my-token" , "--ca-cert-path" , "testdata/selfSignedCert.crt" },
7261 expectedContext : config.NamedContext {
73- Name : testBar ,
62+ Name : "bar" ,
7463 Context : & config.StsContext {
75- URL : testContextURL ,
76- ServiceToken : testToken ,
77- APIPath : testAPIPath ,
64+ URL : "http://bar.com" ,
65+ ServiceToken : "my-token" ,
66+ APIPath : "/api" ,
7867 CaCertBase64Data : selfSignedBase64Cert ,
7968 },
8069 },
@@ -83,13 +72,13 @@ func TestSaveContext(t *testing.T) { //nolint:funlen
8372 },
8473 {
8574 name : "new context ca-cert is set with ca-cert-path" ,
86- args : []string {nameFlagArg , testCACertContext , urlFlagArg , testContextURL , serviceTokenFlagArg , testToken , caCertBase64DataFlagArg , privateCaBase64Cert },
75+ args : []string {"--name" , "cacertdata" , "--url" , "http://bar.com" , "--service-token" , "my-token" , "--ca-cert-base64-data" , privateCaBase64Cert },
8776 expectedContext : config.NamedContext {
88- Name : testCACertContext ,
77+ Name : "cacertdata" ,
8978 Context : & config.StsContext {
90- URL : testContextURL ,
91- ServiceToken : testToken ,
92- APIPath : testAPIPath ,
79+ URL : "http://bar.com" ,
80+ ServiceToken : "my-token" ,
81+ APIPath : "/api" ,
9382 CaCertBase64Data : privateCaBase64Cert ,
9483 },
9584 },
@@ -98,13 +87,13 @@ func TestSaveContext(t *testing.T) { //nolint:funlen
9887 },
9988 {
10089 name : "ca-cert-path takes precedence over ca-cert-base64-data" ,
101- args : []string {nameFlagArg , testCACertContext , urlFlagArg , testContextURL , serviceTokenFlagArg , testToken , caCertPathFlagArg , "testdata/selfSignedCert.crt" , caCertBase64DataFlagArg , privateCaBase64Cert },
90+ args : []string {"--name" , "cacertdata" , "--url" , "http://bar.com" , "--service-token" , "my-token" , "--ca-cert-path" , "testdata/selfSignedCert.crt" , "--ca-cert-base64-data" , privateCaBase64Cert },
10291 expectedContext : config.NamedContext {
103- Name : testCACertContext ,
92+ Name : "cacertdata" ,
10493 Context : & config.StsContext {
105- URL : testContextURL ,
106- ServiceToken : testToken ,
107- APIPath : testAPIPath ,
94+ URL : "http://bar.com" ,
95+ ServiceToken : "my-token" ,
96+ APIPath : "/api" ,
10897 CaCertBase64Data : selfSignedBase64Cert ,
10998 },
11099 },
@@ -113,13 +102,13 @@ func TestSaveContext(t *testing.T) { //nolint:funlen
113102 },
114103 {
115104 name : "ca-cert ignored if skip-ssl is set" ,
116- args : []string {nameFlagArg , testBar , urlFlagArg , testContextURL , serviceTokenFlagArg , testToken , "--skip-ssl" , caCertPathFlagArg , "/path/to/ca.crt" , caCertBase64DataFlagArg , "base64-data" },
105+ args : []string {"--name" , "bar" , "--url" , "http://bar.com" , "--service-token" , "my-token" , "--skip-ssl" , "--ca-cert-path" , "/path/to/ca.crt" , "--ca-cert-base64-data" , "base64-data" },
117106 expectedContext : config.NamedContext {
118- Name : testBar ,
107+ Name : "bar" ,
119108 Context : & config.StsContext {
120- URL : testContextURL ,
121- ServiceToken : testToken ,
122- APIPath : testAPIPath ,
109+ URL : "http://bar.com" ,
110+ ServiceToken : "my-token" ,
111+ APIPath : "/api" ,
123112 SkipSSL : true ,
124113 CaCertBase64Data : "" ,
125114 CaCertPath : "" ,
@@ -130,14 +119,14 @@ func TestSaveContext(t *testing.T) { //nolint:funlen
130119 },
131120 {
132121 name : "no save on missing tokens" ,
133- args : []string {nameFlagArg , testBar , urlFlagArg , "http://my-bar.com" },
122+ args : []string {"--name" , "bar" , "--url" , "http://my-bar.com" },
134123 expectedContext : config.NamedContext {},
135124 wantErr : true ,
136125 errorMessage : "one of the required flags {api-token | service-token} not set" ,
137126 },
138127 {
139128 name : "ca-cert-path is not found" ,
140- args : []string {nameFlagArg , testBar , urlFlagArg , "http://my-bar.com" , serviceTokenFlagArg , testToken , caCertPathFlagArg , "/path/to/ca.crt" },
129+ args : []string {"--name" , "bar" , "--url" , "http://my-bar.com" , "--service-token" , "my-token" , "--ca-cert-path" , "/path/to/ca.crt" },
141130 expectedContext : config.NamedContext {},
142131 wantErr : true ,
143132 errorMessage : "no such file or directory" ,
0 commit comments