@@ -13,7 +13,7 @@ import (
1313 cliConfig "github.com/oasisprotocol/cli/config"
1414)
1515
16- func TestPublicVarMetadataKeyRejectsInvalidNames (t * testing.T ) {
16+ func TestPublicVarRejectsInvalidNames (t * testing.T ) {
1717 for _ , name := range []string {
1818 "" ,
1919 "API-URL" ,
@@ -28,7 +28,7 @@ func TestPublicVarMetadataKeyRejectsInvalidNames(t *testing.T) {
2828 }
2929}
3030
31- func TestParsePublicVarValueRejectsInvalidValues (t * testing.T ) {
31+ func TestParsePublicVarRejectsInvalidValues (t * testing.T ) {
3232 for _ , value := range [][]byte {
3333 {0xff },
3434 } {
@@ -45,12 +45,12 @@ func TestPublicVarCommandsUpdateManifest(t *testing.T) {
4545 t .Chdir (tmpDir )
4646
4747 const (
48- testGreetingVarName = "GREETING"
49- testGreetingValue = "hello"
50- testAPIURLVarName = "API_URL"
51- testAPIURLValue = "https://example.com?a=b#c"
52- testConfigVarName = "CONFIG"
53- testConfigValue = `{"mode":"prod"}`
48+ testGreetingVar = "GREETING"
49+ testGreetingValue = "hello"
50+ testAPIURLVar = "API_URL"
51+ testAPIURLValue = "https://example.com?a=b#c"
52+ testConfigVar = "CONFIG"
53+ testConfigValue = `{"mode":"prod"}`
5454 )
5555
5656 prevConfig := * cliConfig .Global ()
@@ -83,54 +83,61 @@ deployments:
8383 greetingFile := filepath .Join (tmpDir , "greeting.txt" )
8484 err = os .WriteFile (greetingFile , []byte (testGreetingValue ), 0o600 )
8585 require .NoError (err )
86- publicVarSetCmd .Run (publicVarSetCmd , []string {testGreetingVarName , greetingFile })
86+ publicVarSetCmd .Run (publicVarSetCmd , []string {testGreetingVar , greetingFile })
8787
8888 envFile := filepath .Join (tmpDir , ".env" )
89- env := fmt .Sprintf ("# public vars\n %s=%s # trailing comment\n %s=%s\n " , testAPIURLVarName , testAPIURLValue , testConfigVarName , testConfigValue )
89+ env := fmt .Sprintf ("# public vars\n %s=%s # trailing comment\n %s=%s\n " , testAPIURLVar , testAPIURLValue , testConfigVar , testConfigValue )
9090 err = os .WriteFile (envFile , []byte (env ), 0o600 )
9191 require .NoError (err )
9292 publicVarImportCmd .Run (publicVarImportCmd , []string {envFile })
9393
9494 manifest , err := buildRofl .LoadManifest ()
9595 require .NoError (err )
9696 metadata := manifest .Deployments ["testnet" ].Metadata
97- require .Equal (testGreetingValue , metadata [publicVarMetadataPrefix + testGreetingVarName ])
98- require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVarName ])
99- require .Equal (testConfigValue , metadata [publicVarMetadataPrefix + testConfigVarName ])
97+ require .Equal (testGreetingValue , metadata [publicVarMetadataPrefix + testGreetingVar ])
98+ require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVar ])
99+ require .Equal (testConfigValue , metadata [publicVarMetadataPrefix + testConfigVar ])
100100
101101 // Test public-var get
102102 output := captureStdout (t , func () {
103- publicVarGetCmd .Run (publicVarGetCmd , []string {testGreetingVarName })
103+ publicVarGetCmd .Run (publicVarGetCmd , []string {testGreetingVar })
104104 })
105- require .Contains (output , fmt .Sprintf ("Name: %s" , testGreetingVarName ))
105+ require .Contains (output , fmt .Sprintf ("Name: %s" , testGreetingVar ))
106106 require .Contains (output , fmt .Sprintf ("Value: %s" , testGreetingValue ))
107107
108108 // Test public-var rm
109- publicVarRmCmd .Run (publicVarRmCmd , []string {testGreetingVarName })
109+ publicVarRmCmd .Run (publicVarRmCmd , []string {testGreetingVar })
110110 manifest , err = buildRofl .LoadManifest ()
111111 require .NoError (err )
112112 metadata = manifest .Deployments ["testnet" ].Metadata
113- require .NotContains (metadata , publicVarMetadataPrefix + testGreetingVarName )
114- require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVarName ])
115- require .Equal (testConfigValue , metadata [publicVarMetadataPrefix + testConfigVarName ])
113+ require .NotContains (metadata , publicVarMetadataPrefix + testGreetingVar )
114+ require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVar ])
115+ require .Equal (testConfigValue , metadata [publicVarMetadataPrefix + testConfigVar ])
116116
117117 // Override public variable to an empty string.
118118 emptyFile := filepath .Join (tmpDir , "empty.txt" )
119119 err = os .WriteFile (emptyFile , nil , 0o600 )
120120 require .NoError (err )
121121 withForce (t , true , func () {
122- publicVarSetCmd .Run (publicVarSetCmd , []string {testConfigVarName , emptyFile })
122+ publicVarSetCmd .Run (publicVarSetCmd , []string {testConfigVar , emptyFile })
123123 })
124124 manifest , err = buildRofl .LoadManifest ()
125125 require .NoError (err )
126126 metadata = manifest .Deployments ["testnet" ].Metadata
127- require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVarName ])
128- require .Equal ("" , metadata [publicVarMetadataPrefix + testConfigVarName ])
127+ require .Equal (testAPIURLValue , metadata [publicVarMetadataPrefix + testAPIURLVar ])
128+ require .Equal ("" , metadata [publicVarMetadataPrefix + testConfigVar ])
129129}
130130
131131func withForce (t * testing.T , enabled bool , fn func ()) {
132132 t .Helper ()
133133
134+ boolFlagValue := func (v bool ) string {
135+ if v {
136+ return "true"
137+ }
138+ return "false"
139+ }
140+
134141 prev := cliCommon .IsForce ()
135142 require .NoError (t , cliCommon .ForceFlag .Set ("force" , boolFlagValue (enabled )))
136143 defer func () {
@@ -139,10 +146,3 @@ func withForce(t *testing.T, enabled bool, fn func()) {
139146
140147 fn ()
141148}
142-
143- func boolFlagValue (v bool ) string {
144- if v {
145- return "true"
146- }
147- return "false"
148- }
0 commit comments