Skip to content

Commit 5d67e2d

Browse files
alkalescentalkalescent
committed
lint
1 parent 7a14176 commit 5d67e2d

File tree

6 files changed

+30
-15
lines changed

6 files changed

+30
-15
lines changed

‎service/policy/db/attribute_values.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ func getAttributeValueSql(id string, opts attributeValueSelectOptions) (string,
213213
"'value', vmv.value, " +
214214
"'active', vmv.active, " +
215215
"'members', vmv.members || ARRAY[]::UUID[], " +
216-
"'metadata', JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', vmv.metadata->'labels', 'created_at', vmv.created_at, 'updated_at', vmv.updated_at)), " +
216+
getMetadataField("vmv", true) +
217217
"'attribute', JSON_BUILD_OBJECT(" +
218218
"'id', vmv.attribute_definition_id )"
219219
if opts.withFqn {
@@ -225,7 +225,7 @@ func getAttributeValueSql(id string, opts attributeValueSelectOptions) (string,
225225
"av.value",
226226
"av.active",
227227
members,
228-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', av.metadata->'labels', 'created_at', av.created_at, 'updated_at', av.updated_at)) as metadata",
228+
getMetadataField("av", false),
229229
"av.attribute_definition_id",
230230
}
231231
if opts.withFqn {
@@ -278,7 +278,7 @@ func listAttributeValuesSql(attribute_id string, opts attributeValueSelectOption
278278
"'value', vmv.value, " +
279279
"'active', vmv.active, " +
280280
"'members', vmv.members || ARRAY[]::UUID[], " +
281-
"'metadata', JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', vmv.metadata->'labels', 'created_at', vmv.created_at, 'updated_at', vmv.updated_at)), " +
281+
getMetadataField("vmv", true) +
282282
"'attribute', JSON_BUILD_OBJECT(" +
283283
"'id', vmv.attribute_definition_id )"
284284
if opts.withFqn {
@@ -290,7 +290,7 @@ func listAttributeValuesSql(attribute_id string, opts attributeValueSelectOption
290290
"av.value",
291291
"av.active",
292292
members,
293-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', av.metadata->'labels', 'created_at', av.created_at, 'updated_at', av.updated_at)) as metadata",
293+
getMetadataField("av", false),
294294
"av.attribute_definition_id",
295295
}
296296
if opts.withFqn {
@@ -349,7 +349,7 @@ func listAllAttributeValuesSql(opts attributeValueSelectOptions) (string, []inte
349349
"'value', vmv.value, " +
350350
"'active', vmv.active, " +
351351
"'members', vmv.members || ARRAY[]::UUID[], " +
352-
"'metadata', vmv.metadata, " +
352+
getMetadataField("vmv", true) +
353353
"'attribute', JSON_BUILD_OBJECT(" +
354354
"'id', vmv.attribute_definition_id )"
355355
if opts.withFqn {
@@ -361,7 +361,7 @@ func listAllAttributeValuesSql(opts attributeValueSelectOptions) (string, []inte
361361
"av.value",
362362
"av.active",
363363
members,
364-
"av.metadata",
364+
getMetadataField("av", false),
365365
"av.attribute_definition_id",
366366
}
367367
if opts.withFqn {

‎service/policy/db/attributes.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func attributesSelect(opts attributesSelectOptions) sq.SelectBuilder {
8080
t.Field("id"),
8181
t.Field("name"),
8282
t.Field("rule"),
83-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', " + t.Field("metadata") + "->'labels', 'created_at', " + t.Field("created_at") + ", 'updated_at', " + t.Field("updated_at") + ")) as metadata",
83+
getMetadataField(t.Name(), false),
8484
t.Field("namespace_id"),
8585
t.Field("active"),
8686
nt.Field("name"),
@@ -152,10 +152,10 @@ func attributesSelect(opts attributesSelectOptions) sq.SelectBuilder {
152152
"JSON_AGG(JSON_BUILD_OBJECT(" +
153153
"'id', " + smT.Field("id") + "," +
154154
"'actions', " + smT.Field("actions") + "," +
155-
"'metadata', " + smT.Field("metadata") + "," +
155+
getMetadataField(smT.Name(), true) +
156156
"'subject_condition_set', JSON_BUILD_OBJECT(" +
157157
"'id', " + scsT.Field("id") + "," +
158-
"'metadata', JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', " + scsT.Field("metadata") + "->'labels', 'created_at', " + scsT.Field("created_at") + ", 'updated_at', " + scsT.Field("updated_at") + "))," +
158+
getMetadataField(scsT.Name(), true) +
159159
"'subject_sets', " + scsT.Field("condition") +
160160
")" +
161161
")) AS sub_maps_arr " +

‎service/policy/db/namespaces.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func getNamespaceSql(id string, opts namespaceSelectOptions) (string, []interfac
7676
t.Field("id"),
7777
t.Field("name"),
7878
t.Field("active"),
79-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', metadata->'labels', 'created_at', \"created_at\", 'updated_at', \"updated_at\")) as metadata",
79+
getMetadataField("", false),
8080
}
8181

8282
if opts.withFqn {
@@ -125,7 +125,7 @@ func listNamespacesSql(opts namespaceSelectOptions) (string, []interface{}, erro
125125
t.Field("id"),
126126
t.Field("name"),
127127
t.Field("active"),
128-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', metadata->'labels', 'created_at', \"created_at\", 'updated_at', \"updated_at\")) as metadata",
128+
getMetadataField("", false),
129129
}
130130

131131
if opts.withFqn {

‎service/policy/db/resource_mapping.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func resourceMappingSelect() sq.SelectBuilder {
7979
")) FILTER (WHERE vmv.id IS NOT NULL ), '[]')"
8080
return db.NewStatementBuilder().Select(
8181
t.Field("id"),
82-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', "+t.Field("metadata")+"->'labels', 'created_at', "+t.Field("created_at")+", 'updated_at', "+t.Field("updated_at")+")) as metadata",
82+
getMetadataField(t.Name(), false),
8383
t.Field("terms"),
8484
"JSON_BUILD_OBJECT("+
8585
"'id', av.id,"+

‎service/policy/db/subject_mappings.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func subjectConditionSetSelect() sq.SelectBuilder {
8989
t := Tables.SubjectConditionSet
9090
return db.NewStatementBuilder().Select(
9191
t.Field("id"),
92-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', metadata->'labels', 'created_at', \"created_at\", 'updated_at', \"updated_at\")) as metadata",
92+
getMetadataField("", false),
9393
t.Field("condition"),
9494
)
9595
}
@@ -155,10 +155,10 @@ func subjectMappingSelect() sq.SelectBuilder {
155155
return db.NewStatementBuilder().Select(
156156
t.Field("id"),
157157
t.Field("actions"),
158-
"JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', "+t.Field("metadata")+"->'labels', 'created_at', "+t.Field("created_at")+", 'updated_at', "+t.Field("updated_at")+")) as metadata",
158+
getMetadataField(t.Name(), false),
159159
"JSON_BUILD_OBJECT("+
160160
"'id', "+scsT.Field("id")+", "+
161-
"'metadata', JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', "+scsT.Field("metadata")+"->'labels', 'created_at', "+scsT.Field("created_at")+", 'updated_at', "+scsT.Field("updated_at")+")), "+
161+
getMetadataField(scsT.Name(), true)+
162162
"'subject_sets', "+scsT.Field("condition")+
163163
") AS subject_condition_set",
164164
"JSON_BUILD_OBJECT("+

‎service/policy/db/utils.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package db
2+
3+
func getMetadataField(table string, json_obj bool) string {
4+
if table != "" {
5+
table += "."
6+
}
7+
metadata := "JSON_STRIP_NULLS(JSON_BUILD_OBJECT('labels', " + table + "metadata->'labels', 'created_at', " + table + "created_at, 'updated_at', " + table + "updated_at))"
8+
9+
if json_obj {
10+
metadata = "'metadata', " + metadata + ", "
11+
} else {
12+
metadata += " AS metadata"
13+
}
14+
return metadata
15+
}

0 commit comments

Comments
 (0)