Skip to content

Commit 66ad6a0

Browse files
NikolaySNikolayS
authored
Merge branch 'smitronin-feat/ui-docs-update' into feat/ui-docs-update
2 parents 41fd51a + 65febde commit 66ad6a0

31 files changed

+28255
-4980
lines changed

‎engine/api/swagger-ui/swagger-ui-bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-es-bundle-core.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-es-bundle-core.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-es-bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-es-bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-standalone-preset.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui-standalone-preset.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/api/swagger-ui/swagger-ui.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎engine/go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ require (
2626
github.com/stretchr/testify v1.7.0
2727
github.com/testcontainers/testcontainers-go v0.12.0
2828
github.com/urfave/cli/v2 v2.1.1
29-
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
30-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
29+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
30+
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f
3131
gopkg.in/yaml.v2 v2.4.0
3232
)
3333

3434
require (
35-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
35+
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795 // indirect
3636
github.com/Microsoft/go-winio v0.4.17 // indirect
3737
github.com/StackExchange/wmi v1.2.1 // indirect
3838
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
@@ -56,25 +56,25 @@ require (
5656
github.com/magiconair/properties v1.8.5 // indirect
5757
github.com/moby/sys/mount v0.2.0 // indirect
5858
github.com/moby/sys/mountinfo v0.5.0 // indirect
59-
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
60-
github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
59+
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
60+
github.com/morikuni/aec v1.0.0 // indirect
6161
github.com/opencontainers/go-digest v1.0.0 // indirect
6262
github.com/opencontainers/image-spec v1.0.2 // indirect
63-
github.com/opencontainers/runc v1.0.3 // indirect
63+
github.com/opencontainers/runc v1.1.0 // indirect
6464
github.com/pmezard/go-difflib v1.0.0 // indirect
6565
github.com/russross/blackfriday/v2 v2.0.1 // indirect
6666
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
6767
github.com/sirupsen/logrus v1.8.1 // indirect
6868
github.com/stretchr/objx v0.2.0 // indirect
69-
golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect
70-
golang.org/x/sys v0.0.0-20211109184856-51b60fd695b3 // indirect
69+
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
70+
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
7171
golang.org/x/text v0.3.7 // indirect
7272
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
73-
google.golang.org/appengine v1.6.5 // indirect
74-
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
75-
google.golang.org/grpc v1.33.2 // indirect
73+
google.golang.org/appengine v1.6.7 // indirect
74+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
75+
google.golang.org/grpc v1.43.0 // indirect
7676
google.golang.org/protobuf v1.27.1 // indirect
77-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
77+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
7878
)
7979

8080
// Include the single version of the dependency to clean up go.sum from old revisions.
@@ -88,6 +88,6 @@ replace (
8888
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2 // mitigate CVE-2021-3121
8989
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // mitigate CVE-2021-41190
9090
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3 // mitigate CVE-2021-30465
91-
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // mitigate CVE-2018-16875 and CVE-2020-29652
91+
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // mitigate CVE-2021-43565, CVE-2020-29652, and CVE-2018-16875
9292
k8s.io/kubernetes v1.13.0 => k8s.io/kubernetes v1.23.3 // mitigate CVE-2020-8559 and CVE-2020-8565
9393
)

‎engine/go.sum

Lines changed: 114 additions & 12 deletions
Large diffs are not rendered by default.

‎engine/internal/provision/thinclones/zfs/zfs.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,11 @@ func (m *Manager) Pool() *resources.Pool {
172172
func (m *Manager) CreateClone(cloneName, snapshotID string) error {
173173
exists, err := m.cloneExists(cloneName)
174174
if err != nil {
175-
return errors.Wrap(err, "clone does not exist")
175+
return fmt.Errorf("cannot check the clone existence: %w", err)
176176
}
177177

178178
if exists {
179-
log.Msg(fmt.Sprintf("clone %q is already exists. Skip creation", cloneName))
180-
return nil
179+
return fmt.Errorf("clone %q is already exists. Skip creation", cloneName)
181180
}
182181

183182
clonesMountDir := m.config.Pool.ClonesDir()
@@ -225,7 +224,7 @@ func (m *Manager) DestroyClone(cloneName string) error {
225224

226225
// cloneExists checks whether a ZFS clone exists.
227226
func (m *Manager) cloneExists(name string) (bool, error) {
228-
listZfsClonesCmd := "zfs list"
227+
listZfsClonesCmd := "zfs list -r " + m.config.Pool.Name
229228

230229
out, err := m.runner.Run(listZfsClonesCmd, false)
231230
if err != nil {

‎ui/cspell.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
"craco",
138138
"Formik",
139139
"healthz",
140-
"SAST"
140+
"SAST",
141+
"rehype"
141142
]
142143
}

0 commit comments

Comments
 (0)