Merge pull request #121 from Yashsharma1911/yash/addWorkspaceSchema

Add workspace schema and struct
meshery · Jul 31, 2024 · f365196 · f365196
2 parents a35a7a4 + 2a44368
commit f365196
Show file tree

Hide file tree

Showing 5 changed files with 746 additions and 3 deletions.
diff --git a/models/core/core.go b/models/core/core.go
diff --git a/models/v1beta1/workspace.go b/models/v1beta1/workspace.go
diff --git a/schemas/constructs/openapi/common/core.yml b/schemas/constructs/openapi/common/core.yml
@@ -177,7 +177,7 @@ components:
       x-go-type-name: OrganizationId
       x-go-type-skip-optional-pointer: true
 
-    environment_id:
+    general_id:
       type: string
       format: uuid
       x-go-type: uuid.UUID
@@ -186,9 +186,69 @@ components:
       x-oapi-codegen-extra-tags:
         db: id
         json: id
+      x-go-type-name: GeneralId
+      x-go-type-skip-optional-pointer: true
+
+    environment_id:
+      type: string
+      format: uuid
+      x-go-type: uuid.UUID
+      x-go-type-import: 
+        path: github.com/gofrs/uuid
+      x-oapi-codegen-extra-tags:
+        db: environment_id
+        json: environment_id
       x-go-type-name: EnvironmentId
       x-go-type-skip-optional-pointer: true
 
+    workspace_id:
+      type: string
+      format: uuid
+      x-go-type: uuid.UUID
+      x-go-type-import: 
+        path: github.com/gofrs/uuid
+      x-oapi-codegen-extra-tags:
+        db: workspace_id
+        json: workspace_id
+      x-go-type-name: WorkspaceId
+      x-go-type-skip-optional-pointer: true
+
+    view_id:
+      type: string
+      format: uuid
+      x-go-type: uuid.UUID
+      x-go-type-import: 
+        path: github.com/gofrs/uuid
+      x-oapi-codegen-extra-tags:
+        db: view_id
+        json: view_id
+      x-go-type-name: ViewId
+      x-go-type-skip-optional-pointer: true
+
+    team_id:
+      type: string
+      format: uuid
+      x-go-type: uuid.UUID
+      x-go-type-import: 
+        path: github.com/gofrs/uuid
+      x-oapi-codegen-extra-tags:
+        db: team_id
+        json: team_id
+      x-go-type-name: TeamId
+      x-go-type-skip-optional-pointer: true
+
+    design_id:
+      type: string
+      format: uuid
+      x-go-type: uuid.UUID
+      x-go-type-import: 
+        path: github.com/gofrs/uuid
+      x-oapi-codegen-extra-tags:
+        db: design_id
+        json: design_id
+      x-go-type-name: DesignId
+      x-go-type-skip-optional-pointer: true
+
     credential_uuid: 
       type: string
       format: uuid

diff --git a/schemas/constructs/openapi/environment.yml b/schemas/constructs/openapi/environment.yml
@@ -27,7 +27,7 @@ components:
     environment:
       properties:
         ID:
-          $ref: ./common/core.yml#/components/schemas/environment_id
+          $ref: ./common/core.yml#/components/schemas/general_id
         name:
           $ref: ./common/core.yml#/components/schemas/text
         description:
@@ -45,7 +45,7 @@ components:
     environmentConnectionMapping:
       properties:
         ID:
-          $ref: ./common/core.yml#/components/schemas/environment_id
+          $ref: ./common/core.yml#/components/schemas/general_id
         environment_id:
           type: string
           format: uuid