Skip to content

Commit bcbb085

Browse files
christeredvartsenchristeredvartsen
committed
Rename environment fields
1 parent 227ae38 commit bcbb085

28 files changed

+2249
-398
lines changed

‎internal/graph/applications.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ func (r *applicationResolver) Team(ctx context.Context, obj *application.Applica
2323
}
2424

2525
func (r *applicationResolver) Environment(ctx context.Context, obj *application.Application) (*team.TeamEnvironment, error) {
26+
return r.TeamEnvironment(ctx, obj)
27+
}
28+
29+
func (r *applicationResolver) TeamEnvironment(ctx context.Context, obj *application.Application) (*team.TeamEnvironment, error) {
2630
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
2731
}
2832

‎internal/graph/bigquery.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ func (r *bigQueryDatasetResolver) Team(ctx context.Context, obj *bigquery.BigQue
2828
}
2929

3030
func (r *bigQueryDatasetResolver) Environment(ctx context.Context, obj *bigquery.BigQueryDataset) (*team.TeamEnvironment, error) {
31+
return r.TeamEnvironment(ctx, obj)
32+
}
33+
34+
func (r *bigQueryDatasetResolver) TeamEnvironment(ctx context.Context, obj *bigquery.BigQueryDataset) (*team.TeamEnvironment, error) {
3135
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
3236
}
3337

‎internal/graph/bucket.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func (r *bucketResolver) Team(ctx context.Context, obj *bucket.Bucket) (*team.Te
2525
}
2626

2727
func (r *bucketResolver) Environment(ctx context.Context, obj *bucket.Bucket) (*team.TeamEnvironment, error) {
28+
return r.TeamEnvironment(ctx, obj)
29+
}
30+
31+
func (r *bucketResolver) TeamEnvironment(ctx context.Context, obj *bucket.Bucket) (*team.TeamEnvironment, error) {
2832
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
2933
}
3034

‎internal/graph/gengql/generated.go

+2,138-375
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/graph/jobs.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func (r *jobResolver) Team(ctx context.Context, obj *job.Job) (*team.Team, error
2525
}
2626

2727
func (r *jobResolver) Environment(ctx context.Context, obj *job.Job) (*team.TeamEnvironment, error) {
28+
return r.TeamEnvironment(ctx, obj)
29+
}
30+
31+
func (r *jobResolver) TeamEnvironment(ctx context.Context, obj *job.Job) (*team.TeamEnvironment, error) {
2832
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
2933
}
3034

‎internal/graph/kafka.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ func (r *kafkaTopicResolver) Team(ctx context.Context, obj *kafkatopic.KafkaTopi
3737
}
3838

3939
func (r *kafkaTopicResolver) Environment(ctx context.Context, obj *kafkatopic.KafkaTopic) (*team.TeamEnvironment, error) {
40+
return r.TeamEnvironment(ctx, obj)
41+
}
42+
43+
func (r *kafkaTopicResolver) TeamEnvironment(ctx context.Context, obj *kafkatopic.KafkaTopic) (*team.TeamEnvironment, error) {
4044
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
4145
}
4246

‎internal/graph/opensearch.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func (r *openSearchResolver) Team(ctx context.Context, obj *opensearch.OpenSearc
2525
}
2626

2727
func (r *openSearchResolver) Environment(ctx context.Context, obj *opensearch.OpenSearch) (*team.TeamEnvironment, error) {
28+
return r.TeamEnvironment(ctx, obj)
29+
}
30+
31+
func (r *openSearchResolver) TeamEnvironment(ctx context.Context, obj *opensearch.OpenSearch) (*team.TeamEnvironment, error) {
2832
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
2933
}
3034

‎internal/graph/redis.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ func (r *redisInstanceResolver) Team(ctx context.Context, obj *redis.RedisInstan
2525
}
2626

2727
func (r *redisInstanceResolver) Environment(ctx context.Context, obj *redis.RedisInstance) (*team.TeamEnvironment, error) {
28+
return r.TeamEnvironment(ctx, obj)
29+
}
30+
31+
func (r *redisInstanceResolver) TeamEnvironment(ctx context.Context, obj *redis.RedisInstance) (*team.TeamEnvironment, error) {
2832
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
2933
}
3034

‎internal/graph/schema/applications.graphqls

+6-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,12 @@ type Application implements Node & Workload {
116116
"""
117117
The environment the application is deployed in.
118118
"""
119-
environment: TeamEnvironment!
119+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
120+
121+
"""
122+
The team environment for the workload.
123+
"""
124+
teamEnvironment: TeamEnvironment!
120125

121126
"""
122127
The container image of the application.

‎internal/graph/schema/bigquery.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ type BigQueryDataset implements Persistence & Node {
6060
id: ID!
6161
name: String!
6262
team: Team!
63-
environment: TeamEnvironment!
63+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
64+
teamEnvironment: TeamEnvironment!
6465
cascadingDelete: Boolean!
6566
description: String
6667
access(

‎internal/graph/schema/bucket.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ type Bucket implements Persistence & Node {
6060
id: ID!
6161
name: String!
6262
team: Team!
63-
environment: TeamEnvironment!
63+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
64+
teamEnvironment: TeamEnvironment!
6465
cascadingDelete: Boolean!
6566
publicAccessPrevention: String!
6667
uniformBucketLevelAccess: Boolean!

‎internal/graph/schema/jobs.graphqls

+4-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ type Job implements Node & Workload {
6565
team: Team!
6666

6767
"The environment the job is deployed in."
68-
environment: TeamEnvironment!
68+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
69+
70+
"The team environment for the workload."
71+
teamEnvironment: TeamEnvironment!
6972

7073
"The container image of the job."
7174
image: ContainerImage!

‎internal/graph/schema/kafka.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ type KafkaTopic implements Persistence & Node {
6060
id: ID!
6161
name: String!
6262
team: Team!
63-
environment: TeamEnvironment!
63+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
64+
teamEnvironment: TeamEnvironment!
6465
acl(
6566
first: Int
6667
after: Cursor

‎internal/graph/schema/opensearch.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ type OpenSearch implements Persistence & Node {
5151
id: ID!
5252
name: String!
5353
team: Team!
54-
environment: TeamEnvironment!
54+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
55+
teamEnvironment: TeamEnvironment!
5556
status: OpenSearchStatus!
5657
workload: Workload
5758
access(

‎internal/graph/schema/persistence.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ interface Persistence implements Node {
22
id: ID!
33
name: String!
44
team: Team!
5-
environment: TeamEnvironment!
5+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
6+
teamEnvironment: TeamEnvironment!
67
}

‎internal/graph/schema/redis.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ type RedisInstance implements Persistence & Node {
6161
id: ID!
6262
name: String!
6363
team: Team!
64-
environment: TeamEnvironment!
64+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
65+
teamEnvironment: TeamEnvironment!
6566
access(
6667
first: Int
6768
after: Cursor

‎internal/graph/schema/secret.graphqls

+4-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,10 @@ type Secret implements Node {
113113
name: String!
114114

115115
"The environment the secret exists in."
116-
environment: TeamEnvironment!
116+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
117+
118+
"The environment the secret exists in."
119+
teamEnvironment: TeamEnvironment!
117120

118121
"The team that owns the secret."
119122
team: Team!

‎internal/graph/schema/sqlinstance.graphqls

+4-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ type SqlDatabase implements Persistence & Node {
8888
id: ID!
8989
name: String!
9090
team: Team!
91-
environment: TeamEnvironment!
91+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
92+
teamEnvironment: TeamEnvironment!
9293
charset: String
9394
collation: String
9495
deletionPolicy: String
@@ -99,7 +100,8 @@ type SqlInstance implements Persistence & Node {
99100
id: ID!
100101
name: String!
101102
team: Team!
102-
environment: TeamEnvironment!
103+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
104+
teamEnvironment: TeamEnvironment!
103105
workload: Workload
104106
cascadingDelete: Boolean!
105107
connectionName: String

‎internal/graph/schema/teams.graphqls

+4-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ type UpdateTeamPayload {
204204

205205
type UpdateTeamEnvironmentPayload {
206206
"The updated team environment."
207-
environment: TeamEnvironment
207+
environment: TeamEnvironment @deprecated(reason: "Use the `teamEnvironment` field instead.")
208+
209+
"The updated team environment."
210+
teamEnvironment: TeamEnvironment
208211
}
209212

210213
type RequestTeamDeletionPayload {

‎internal/graph/schema/utilization.graphqls

+4-1
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,8 @@ type TeamUtilizationData {
7272
used: Float!
7373

7474
"The environment for the utilization data."
75-
environment: TeamEnvironment!
75+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
76+
77+
"The environment for the utilization data."
78+
teamEnvironment: TeamEnvironment!
7679
}

‎internal/graph/schema/valkey.graphqls

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ type ValkeyInstance implements Persistence & Node {
6060
id: ID!
6161
name: String!
6262
team: Team!
63-
environment: TeamEnvironment!
63+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
64+
teamEnvironment: TeamEnvironment!
6465
access(
6566
first: Int
6667
after: Cursor

‎internal/graph/schema/workloads.graphqls

+6-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,12 @@ interface Workload implements Node {
101101
"""
102102
The environment the workload is deployed in.
103103
"""
104-
environment: TeamEnvironment!
104+
environment: TeamEnvironment! @deprecated(reason: "Use the `teamEnvironment` field instead.")
105+
106+
"""
107+
The team environment for the workload.
108+
"""
109+
teamEnvironment: TeamEnvironment!
105110

106111
"""
107112
The container image of the workload.

‎internal/graph/secret.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ func (r *mutationResolver) DeleteSecret(ctx context.Context, input secret.Delete
116116
}
117117

118118
func (r *secretResolver) Environment(ctx context.Context, obj *secret.Secret) (*team.TeamEnvironment, error) {
119+
return r.TeamEnvironment(ctx, obj)
120+
}
121+
122+
func (r *secretResolver) TeamEnvironment(ctx context.Context, obj *secret.Secret) (*team.TeamEnvironment, error) {
119123
return team.GetTeamEnvironment(ctx, obj.TeamSlug, r.mappedEnvironmentName(obj.EnvironmentName))
120124
}
121125

‎internal/graph/sqlinstance.resolvers.go

+8
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ func (r *sqlDatabaseResolver) Team(ctx context.Context, obj *sqlinstance.SQLData
3636
}
3737

3838
func (r *sqlDatabaseResolver) Environment(ctx context.Context, obj *sqlinstance.SQLDatabase) (*team.TeamEnvironment, error) {
39+
return r.TeamEnvironment(ctx, obj)
40+
}
41+
42+
func (r *sqlDatabaseResolver) TeamEnvironment(ctx context.Context, obj *sqlinstance.SQLDatabase) (*team.TeamEnvironment, error) {
3943
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
4044
}
4145

@@ -44,6 +48,10 @@ func (r *sqlInstanceResolver) Team(ctx context.Context, obj *sqlinstance.SQLInst
4448
}
4549

4650
func (r *sqlInstanceResolver) Environment(ctx context.Context, obj *sqlinstance.SQLInstance) (*team.TeamEnvironment, error) {
51+
return r.TeamEnvironment(ctx, obj)
52+
}
53+
54+
func (r *sqlInstanceResolver) TeamEnvironment(ctx context.Context, obj *sqlinstance.SQLInstance) (*team.TeamEnvironment, error) {
4755
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
4856
}
4957

‎internal/graph/teams.resolvers.go

+16-7
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r *mutationResolver) UpdateTeamEnvironment(ctx context.Context, input team
7878
r.triggerTeamUpdatedEvent(ctx, input.Slug, correlationID)
7979

8080
return &team.UpdateTeamEnvironmentPayload{
81-
Environment: teamEnvironment,
81+
TeamEnvironment: teamEnvironment,
8282
}, nil
8383
}
8484

@@ -324,6 +324,10 @@ func (r *teamMemberResolver) User(ctx context.Context, obj *team.TeamMember) (*u
324324
return user.Get(ctx, obj.UserID)
325325
}
326326

327+
func (r *updateTeamEnvironmentPayloadResolver) Environment(ctx context.Context, obj *team.UpdateTeamEnvironmentPayload) (*team.TeamEnvironment, error) {
328+
return obj.TeamEnvironment, nil
329+
}
330+
327331
func (r *Resolver) RemoveTeamMemberPayload() gengql.RemoveTeamMemberPayloadResolver {
328332
return &removeTeamMemberPayloadResolver{r}
329333
}
@@ -342,11 +346,16 @@ func (r *Resolver) TeamInventoryCounts() gengql.TeamInventoryCountsResolver {
342346

343347
func (r *Resolver) TeamMember() gengql.TeamMemberResolver { return &teamMemberResolver{r} }
344348

349+
func (r *Resolver) UpdateTeamEnvironmentPayload() gengql.UpdateTeamEnvironmentPayloadResolver {
350+
return &updateTeamEnvironmentPayloadResolver{r}
351+
}
352+
345353
type (
346-
removeTeamMemberPayloadResolver struct{ *Resolver }
347-
teamResolver struct{ *Resolver }
348-
teamDeleteKeyResolver struct{ *Resolver }
349-
teamEnvironmentResolver struct{ *Resolver }
350-
teamInventoryCountsResolver struct{ *Resolver }
351-
teamMemberResolver struct{ *Resolver }
354+
removeTeamMemberPayloadResolver struct{ *Resolver }
355+
teamResolver struct{ *Resolver }
356+
teamDeleteKeyResolver struct{ *Resolver }
357+
teamEnvironmentResolver struct{ *Resolver }
358+
teamInventoryCountsResolver struct{ *Resolver }
359+
teamMemberResolver struct{ *Resolver }
360+
updateTeamEnvironmentPayloadResolver struct{ *Resolver }
352361
)

‎internal/graph/utilization.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ func (r *teamUtilizationDataResolver) Team(ctx context.Context, obj *utilization
3838
}
3939

4040
func (r *teamUtilizationDataResolver) Environment(ctx context.Context, obj *utilization.TeamUtilizationData) (*team.TeamEnvironment, error) {
41+
return r.TeamEnvironment(ctx, obj)
42+
}
43+
44+
func (r *teamUtilizationDataResolver) TeamEnvironment(ctx context.Context, obj *utilization.TeamUtilizationData) (*team.TeamEnvironment, error) {
4145
return team.GetTeamEnvironment(ctx, obj.TeamSlug, r.mappedEnvironmentName(obj.EnvironmentName))
4246
}
4347

‎internal/graph/valkey.resolvers.go

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ func (r *valkeyInstanceResolver) Team(ctx context.Context, obj *valkey.ValkeyIns
4444
}
4545

4646
func (r *valkeyInstanceResolver) Environment(ctx context.Context, obj *valkey.ValkeyInstance) (*team.TeamEnvironment, error) {
47+
return r.TeamEnvironment(ctx, obj)
48+
}
49+
50+
func (r *valkeyInstanceResolver) TeamEnvironment(ctx context.Context, obj *valkey.ValkeyInstance) (*team.TeamEnvironment, error) {
4751
return team.GetTeamEnvironment(ctx, obj.TeamSlug, obj.EnvironmentName)
4852
}
4953

‎internal/team/model.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ func (i *UpdateTeamEnvironmentInput) Validate() error {
513513
}
514514

515515
type UpdateTeamEnvironmentPayload struct {
516-
Environment *TeamEnvironment `json:"environment"`
516+
TeamEnvironment *TeamEnvironment `json:"teamEnvironment"`
517517
}
518518

519519
type TeamInventoryCounts struct {

0 commit comments

Comments
 (0)