Skip to content

Commit fa5ab16

Browse files
committed
fix: gofmt and JSON validation issues
- Fix gofmt import ordering in test/extended/images/dryrun.go - Fix invalid JSON format in test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json
1 parent 0c45554 commit fa5ab16

File tree

2 files changed

+13
-11
lines changed
  • test/extended

2 files changed

+13
-11
lines changed

test/extended/images/dryrun.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
g "github.com/onsi/ginkgo/v2"
88
o "github.com/onsi/gomega"
99

10-
admissionapi "k8s.io/pod-security-admission/api"
1110
"k8s.io/apimachinery/pkg/util/wait"
11+
admissionapi "k8s.io/pod-security-admission/api"
1212

1313
exutil "github.com/openshift/origin/test/extended/util"
1414
)

test/extended/util/compat_otp/testdata/opm/render/validate/catalog-error/operator-2/index.json

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
[
12
{
23
"schema": "olm.package",
34
"name": "operator-2",
45
"defaultChannel": "beta"
5-
}
6+
},
67
{
78
"schema": "olm.channel",
89
"name": "4.7",
@@ -15,7 +16,7 @@
1516
]
1617
}
1718
]
18-
}
19+
},
1920
{
2021
"schema": "olm.channel",
2122
"name": "4.8",
@@ -30,7 +31,7 @@
3031
"replaces": "operator-2.v0.4.0"
3132
}
3233
]
33-
}
34+
},
3435
{
3536
"schema": "olm.channel",
3637
"name": "4.9",
@@ -41,7 +42,7 @@
4142
"skipRange": ">=0.1.0 <0.6.0"
4243
}
4344
]
44-
}
45+
},
4546
{
4647
"schema": "olm.channel",
4748
"name": "alpha",
@@ -55,7 +56,7 @@
5556
"replaces": "operator-2.v0.1.1"
5657
}
5758
]
58-
}
59+
},
5960
{
6061
"schema": "olm.bundle",
6162
"name": "operator-2.v0.1.0",
@@ -78,7 +79,7 @@
7879
}
7980
}
8081
]
81-
}
82+
},
8283
{
8384
"schema": "olm.bundle",
8485
"name": "operator-2.v0.2.0",
@@ -101,7 +102,7 @@
101102
}
102103
}
103104
]
104-
}
105+
},
105106
{
106107
"schema": "olm.bundle",
107108
"name": "operator-2.v0.3.0",
@@ -124,7 +125,7 @@
124125
}
125126
}
126127
]
127-
}
128+
},
128129
{
129130
"schema": "olm.bundle",
130131
"name": "operator-2.v0.4.0",
@@ -147,7 +148,7 @@
147148
}
148149
}
149150
]
150-
}
151+
},
151152
{
152153
"schema": "olm.bundle",
153154
"name": "operator-2.v0.5.0",
@@ -170,7 +171,7 @@
170171
}
171172
}
172173
]
173-
}
174+
},
174175
{
175176
"schema": "olm.bundle",
176177
"name": "operator-2.v0.6.0",
@@ -194,3 +195,4 @@
194195
}
195196
]
196197
}
198+
]

0 commit comments

Comments
 (0)