55 "testing"
66
77 renderapi "github.com/render-oss/cli/internal/fakes/renderapi"
8- "github.com/render-oss/cli/internal/testids"
98 "github.com/render-oss/cli/pkg/client"
109 "github.com/spf13/pflag"
1110 "github.com/stretchr/testify/assert"
@@ -67,17 +66,16 @@ func TestKVList_MultipleInstances(t *testing.T) {
6766
6867func TestKVList_FilterByEnvironmentID (t * testing.T ) {
6968 server := renderapi .NewServer (t )
70- projectID := testids .ProjectID ("project" )
71- envProdID := testids .EnvironmentID ("production" )
72- envStagingID := testids .EnvironmentID ("staging" )
73- server .Projects .Add (renderapi .NewProject (renderapi.ProjectAttrs {Id : projectID , Name : "My Project" , OwnerId : ACTIVE_WORKSPACE_ID }))
74- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : envProdID , Name : "production" , ProjectId : projectID }))
75- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : envStagingID , Name : "staging" , ProjectId : projectID }))
69+ proj := server .CreateProject (
70+ renderapi.ProjectAttrs {Name : "My Project" , OwnerId : ACTIVE_WORKSPACE_ID },
71+ renderapi.EnvAttrs {Name : "production" },
72+ renderapi.EnvAttrs {Name : "staging" },
73+ )
7674
77- prodKV := seedKVInEnv (server , "prod-cache" , envProdID )
78- stagingKV := seedKVInEnv (server , "staging-cache" , envStagingID )
75+ prodKV := seedKVInEnv (server , "prod-cache" , proj . Env ( "production" ). Id )
76+ stagingKV := seedKVInEnv (server , "staging-cache" , proj . Env ( "staging" ). Id )
7977
80- result , err := executeKVList (t , server , "--environment" , envProdID , "--output" , "text" )
78+ result , err := executeKVList (t , server , "--environment" , proj . Env ( "production" ). Id , "--output" , "text" )
8179 require .NoError (t , err )
8280
8381 assert .Contains (t , result .Stdout , prodKV .Id )
@@ -86,15 +84,14 @@ func TestKVList_FilterByEnvironmentID(t *testing.T) {
8684
8785func TestKVList_FilterByEnvironmentName (t * testing.T ) {
8886 server := renderapi .NewServer (t )
89- projectID := testids .ProjectID ("project" )
90- envProdID := testids .EnvironmentID ("production" )
91- envStagingID := testids .EnvironmentID ("staging" )
92- server .Projects .Add (renderapi .NewProject (renderapi.ProjectAttrs {Id : projectID , Name : "My Project" , OwnerId : ACTIVE_WORKSPACE_ID }))
93- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : envProdID , Name : "production" , ProjectId : projectID }))
94- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : envStagingID , Name : "staging" , ProjectId : projectID }))
87+ proj := server .CreateProject (
88+ renderapi.ProjectAttrs {Name : "My Project" , OwnerId : ACTIVE_WORKSPACE_ID },
89+ renderapi.EnvAttrs {Name : "production" },
90+ renderapi.EnvAttrs {Name : "staging" },
91+ )
9592
96- prodKV := seedKVInEnv (server , "prod-cache" , envProdID )
97- stagingKV := seedKVInEnv (server , "staging-cache" , envStagingID )
93+ prodKV := seedKVInEnv (server , "prod-cache" , proj . Env ( "production" ). Id )
94+ stagingKV := seedKVInEnv (server , "staging-cache" , proj . Env ( "staging" ). Id )
9895
9996 result , err := executeKVList (t , server , "--environment" , "production" , "--output" , "text" )
10097 require .NoError (t , err )
@@ -147,26 +144,19 @@ func TestKVList_UnknownEnvironment_Errors(t *testing.T) {
147144func TestKVList_FilterByProject (t * testing.T ) {
148145 server := renderapi .NewServer (t )
149146
150- projectAID := testids .ProjectID ("project a" )
151- projectBID := testids .ProjectID ("project b" )
152- projectAProdID := testids .EnvironmentID ("project a production" )
153- projectAStagingID := testids .EnvironmentID ("project a staging" )
154- projectBProdID := testids .EnvironmentID ("project b production" )
155-
156- projectA := renderapi .NewProject (renderapi.ProjectAttrs {Id : projectAID , Name : "Project A" , OwnerId : ACTIVE_WORKSPACE_ID })
157- projectA .EnvironmentIds = []string {projectAProdID , projectAStagingID }
158- projectB := renderapi .NewProject (renderapi.ProjectAttrs {Id : projectBID , Name : "Project B" , OwnerId : ACTIVE_WORKSPACE_ID })
159- projectB .EnvironmentIds = []string {projectBProdID }
160-
161- server .Projects .Add (projectA )
162- server .Projects .Add (projectB )
163- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : projectAProdID , Name : "production" , ProjectId : projectAID }))
164- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : projectAStagingID , Name : "staging" , ProjectId : projectAID }))
165- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : projectBProdID , Name : "production" , ProjectId : projectBID }))
147+ projectA := server .CreateProject (
148+ renderapi.ProjectAttrs {Name : "Project A" , OwnerId : ACTIVE_WORKSPACE_ID },
149+ renderapi.EnvAttrs {Name : "production" },
150+ renderapi.EnvAttrs {Name : "staging" },
151+ )
152+ projectB := server .CreateProject (
153+ renderapi.ProjectAttrs {Name : "Project B" , OwnerId : ACTIVE_WORKSPACE_ID },
154+ renderapi.EnvAttrs {Name : "production" },
155+ )
166156
167- aProdKV := seedKVInEnv (server , "a-prod-cache" , projectAProdID )
168- aStagingKV := seedKVInEnv (server , "a-staging-cache" , projectAStagingID )
169- bProdKV := seedKVInEnv (server , "b-prod-cache" , projectBProdID )
157+ aProdKV := seedKVInEnv (server , "a-prod-cache" , projectA . Env ( "production" ). Id )
158+ aStagingKV := seedKVInEnv (server , "a-staging-cache" , projectA . Env ( "staging" ). Id )
159+ bProdKV := seedKVInEnv (server , "b-prod-cache" , projectB . Env ( "production" ). Id )
170160
171161 result , err := executeKVList (t , server , "--project" , "Project A" , "--output" , "text" )
172162 require .NoError (t , err )
@@ -179,23 +169,17 @@ func TestKVList_FilterByProject(t *testing.T) {
179169func TestKVList_FilterByProjectAndEnvironment_NarrowsToEnvWithinProject (t * testing.T ) {
180170 server := renderapi .NewServer (t )
181171
182- projectAID := testids .ProjectID ("project a" )
183- projectBID := testids .ProjectID ("project b" )
184- projectAProdID := testids .EnvironmentID ("project a production" )
185- projectBProdID := testids .EnvironmentID ("project b production" )
186-
187- projectA := renderapi .NewProject (renderapi.ProjectAttrs {Id : projectAID , Name : "Project A" , OwnerId : ACTIVE_WORKSPACE_ID })
188- projectA .EnvironmentIds = []string {projectAProdID }
189- projectB := renderapi .NewProject (renderapi.ProjectAttrs {Id : projectBID , Name : "Project B" , OwnerId : ACTIVE_WORKSPACE_ID })
190- projectB .EnvironmentIds = []string {projectBProdID }
191-
192- server .Projects .Add (projectA )
193- server .Projects .Add (projectB )
194- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : projectAProdID , Name : "production" , ProjectId : projectAID }))
195- server .Environments .Add (renderapi .NewEnvironment (client.Environment {Id : projectBProdID , Name : "production" , ProjectId : projectBID }))
172+ projectA := server .CreateProject (
173+ renderapi.ProjectAttrs {Name : "Project A" , OwnerId : ACTIVE_WORKSPACE_ID },
174+ renderapi.EnvAttrs {Name : "production" },
175+ )
176+ projectB := server .CreateProject (
177+ renderapi.ProjectAttrs {Name : "Project B" , OwnerId : ACTIVE_WORKSPACE_ID },
178+ renderapi.EnvAttrs {Name : "production" },
179+ )
196180
197- aProdKV := seedKVInEnv (server , "a-prod-cache" , projectAProdID )
198- bProdKV := seedKVInEnv (server , "b-prod-cache" , projectBProdID )
181+ aProdKV := seedKVInEnv (server , "a-prod-cache" , projectA . Env ( "production" ). Id )
182+ bProdKV := seedKVInEnv (server , "b-prod-cache" , projectB . Env ( "production" ). Id )
199183
200184 result , err := executeKVList (t , server ,
201185 "--project" , "Project A" ,
0 commit comments