Tweaked the ordering a little

xanzy · Jan 9, 2023 · ce77452 · ce77452
1 parent dcaa030
commit ce77452
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/metadata.go b/metadata.go
@@ -30,14 +30,14 @@ type MetadataService struct {
 //
 // GitLab API docs: https://docs.gitlab.com/ee/api/metadata.html
 type Metadata struct {
-	Version    string `json:"version"`
-	Revision   string `json:"revision"`
-	Enterprise bool   `json:"enterprise"`
-	KAS        struct {
+	Version  string `json:"version"`
+	Revision string `json:"revision"`
+	KAS      struct {
 		Enabled     bool   `json:"enabled"`
 		ExternalURL string `json:"externalUrl"`
 		Version     string `json:"version"`
 	} `json:"kas"`
+	Enterprise bool `json:"enterprise"`
 }
 
 func (s Metadata) String() string {

diff --git a/metadata_test.go b/metadata_test.go
@@ -29,23 +29,35 @@ func TestGetMetadata(t *testing.T) {
 	mux.HandleFunc("/api/v4/metadata",
 		func(w http.ResponseWriter, r *http.Request) {
 			testMethod(t, r, http.MethodGet)
-			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"}}`)
+			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"
+        }
+      }`)
 		})
 
 	version, _, err := client.Metadata.GetMetadata()
 	if err != nil {
 		t.Errorf("Metadata.GetMetadata returned error: %v", err)
 	}
 
-	want := &Metadata{Version: "15.6.0-pre", Revision: "016e8d8bdc3", Enterprise: true, KAS: struct {
-		Enabled     bool   `json:"enabled"`
-		ExternalURL string `json:"externalUrl"`
-		Version     string `json:"version"`
-	}{
-		Enabled:     true,
-		ExternalURL: "wss://kas.gitlab.com",
-		Version:     "15.6.0-rc2",
-	}}
+	want := &Metadata{
+		Version: "15.6.0-pre", Revision: "016e8d8bdc3", KAS: struct {
+			Enabled     bool   `json:"enabled"`
+			ExternalURL string `json:"externalUrl"`
+			Version     string `json:"version"`
+		}{
+			Enabled:     true,
+			ExternalURL: "wss://kas.gitlab.com",
+			Version:     "15.6.0-rc2",
+		},
+		Enterprise: true,
+	}
 	if !reflect.DeepEqual(want, version) {
 		t.Errorf("Metadata.GetMetadata returned %+v, want %+v", version, want)
 	}