Skip to content

Commit ce77452

Browse files
committed
Tweaked the ordering a little
1 parent dcaa030 commit ce77452

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

Diff for: metadata.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ type MetadataService struct {
3030
//
3131
// GitLab API docs: https://docs.gitlab.com/ee/api/metadata.html
3232
type Metadata struct {
33-
Version string `json:"version"`
34-
Revision string `json:"revision"`
35-
Enterprise bool `json:"enterprise"`
36-
KAS struct {
33+
Version string `json:"version"`
34+
Revision string `json:"revision"`
35+
KAS struct {
3736
Enabled bool `json:"enabled"`
3837
ExternalURL string `json:"externalUrl"`
3938
Version string `json:"version"`
4039
} `json:"kas"`
40+
Enterprise bool `json:"enterprise"`
4141
}
4242

4343
func (s Metadata) String() string {

Diff for: metadata_test.go

+22-10
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,35 @@ func TestGetMetadata(t *testing.T) {
2929
mux.HandleFunc("/api/v4/metadata",
3030
func(w http.ResponseWriter, r *http.Request) {
3131
testMethod(t, r, http.MethodGet)
32-
fmt.Fprint(w, `{"version":"15.6.0-pre","revision":"016e8d8bdc3","enterprise":true,"kas":{"enabled":true,"externalUrl":"wss://kas.gitlab.com","version":"15.6.0-rc2"}}`)
32+
fmt.Fprint(w, `{
33+
"version": "15.6.0-pre",
34+
"revision": "016e8d8bdc3",
35+
"enterprise": true,
36+
"kas": {
37+
"enabled": true,
38+
"externalUrl": "wss://kas.gitlab.com",
39+
"version": "15.6.0-rc2"
40+
}
41+
}`)
3342
})
3443

3544
version, _, err := client.Metadata.GetMetadata()
3645
if err != nil {
3746
t.Errorf("Metadata.GetMetadata returned error: %v", err)
3847
}
3948

40-
want := &Metadata{Version: "15.6.0-pre", Revision: "016e8d8bdc3", Enterprise: true, KAS: struct {
41-
Enabled bool `json:"enabled"`
42-
ExternalURL string `json:"externalUrl"`
43-
Version string `json:"version"`
44-
}{
45-
Enabled: true,
46-
ExternalURL: "wss://kas.gitlab.com",
47-
Version: "15.6.0-rc2",
48-
}}
49+
want := &Metadata{
50+
Version: "15.6.0-pre", Revision: "016e8d8bdc3", KAS: struct {
51+
Enabled bool `json:"enabled"`
52+
ExternalURL string `json:"externalUrl"`
53+
Version string `json:"version"`
54+
}{
55+
Enabled: true,
56+
ExternalURL: "wss://kas.gitlab.com",
57+
Version: "15.6.0-rc2",
58+
},
59+
Enterprise: true,
60+
}
4961
if !reflect.DeepEqual(want, version) {
5062
t.Errorf("Metadata.GetMetadata returned %+v, want %+v", version, want)
5163
}

0 commit comments

Comments
 (0)