Applicationのcomponents.DataSourceからDeploySourceへの変更の対応 (#21)

sacloud · Nov 15, 2024 · eafc651 · eafc651
1 parent aff47b6
commit eafc651
Show file tree

Hide file tree

Showing 9 changed files with 86 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -43,8 +43,8 @@ func main() {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},

diff --git a/acceptance_test.go b/acceptance_test.go
@@ -72,8 +72,8 @@ func TestApplicationAPI(t *testing.T) {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},
@@ -144,8 +144,9 @@ func TestVersionAPI(t *testing.T) {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},
@@ -212,8 +213,8 @@ func TestTrafficAPI(t *testing.T) {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},

diff --git a/apis/v1/spec/openapi.yaml b/apis/v1/spec/openapi.yaml
@@ -138,7 +138,7 @@ info:
           "name": "Component01",
           "max_cpu": "0.1",
           "max_memory": "256Mi",
-          "datasource": {
+          "deploy_source": {
             "container_registry": {
               "image": "my-app.sakuracr.jp/my-app:latest"
             }
@@ -191,7 +191,7 @@ info:
           "name": "Component01 updated",
           "max_cpu": "0.1",
           "max_memory": "256Mi",
-          "datasource": {
+          "deploy_source": {
             "container_registry": {
               "image": "my-app.sakuracr.jp/my-app-v2:latest"
             }
@@ -300,7 +300,7 @@ paths:
               schema:
                 $ref: "#/components/schemas/model.defaultError"
         "404":
-          description: さくらのAppRunにユーザーが存在しません
+          description: さくらのAppRunにユーザーが存在しません。
           content:
             application/json:
               schema:
@@ -1314,7 +1314,7 @@ components:
         - name
         - max_cpu
         - max_memory
-        - datasource
+        - deploy_source
       properties:
         name:
           description: コンポーネント名
@@ -1346,9 +1346,9 @@ components:
             - 512Mi
             - 1Gi
             - 2Gi
-        datasource:
+        deploy_source:
           description: コンポーネントを構成するソース
-          $ref: "#/components/schemas/postApplicationBodyComponentDataSource"
+          $ref: "#/components/schemas/postApplicationBodyComponentDeploySource"
         env:
           description: コンポーネントに渡す環境変数
           type: array
@@ -1358,13 +1358,13 @@ components:
         probe:
           description: コンポーネントのプローブ設定
           $ref: "#/components/schemas/postApplicationBodyComponentProbe"
-    postApplicationBodyComponentDataSource:
+    postApplicationBodyComponentDeploySource:
       type: object
       properties:
         container_registry:
           description: コンテナレジストリ
-          $ref: "#/components/schemas/postApplicationBodyComponentDataSourceContainerRegistry"
-    postApplicationBodyComponentDataSourceContainerRegistry:
+          $ref: "#/components/schemas/postApplicationBodyComponentDeploySourceContainerRegistry"
+    postApplicationBodyComponentDeploySourceContainerRegistry:
       type: object
       required:
         - image
@@ -1494,7 +1494,7 @@ components:
         - name
         - max_cpu
         - max_memory
-        - datasource
+        - deploy_source
       properties:
         name:
           description: コンポーネント名
@@ -1526,22 +1526,22 @@ components:
             - 512Mi
             - 1Gi
             - 2Gi
-        datasource:
+        deploy_source:
           description: コンポーネントを構成するソース
-          $ref: "#/components/schemas/patchApplicationBodyComponentDataSource"
+          $ref: "#/components/schemas/patchApplicationBodyComponentDeploySource"
         env:
           description: コンポーネントに渡す環境変数
           $ref: "#/components/schemas/patchApplicationBodyComponentEnv"
         probe:
           description: コンポーネントのプローブ設定
           $ref: "#/components/schemas/patchApplicationBodyComponentProbe"
-    patchApplicationBodyComponentDataSource:
+    patchApplicationBodyComponentDeploySource:
       type: object
       properties:
         container_registry:
           description: コンテナレジストリ
-          $ref: "#/components/schemas/patchApplicationBodyComponentDataSourceContainerRegistry"
-    patchApplicationBodyComponentDataSourceContainerRegistry:
+          $ref: "#/components/schemas/patchApplicationBodyComponentDeploySourceContainerRegistry"
+    patchApplicationBodyComponentDeploySourceContainerRegistry:
       type: object
       required:
         - image
@@ -1692,7 +1692,7 @@ components:
         - name
         - max_cpu
         - max_memory
-        - datasource
+        - deploy_source
       properties:
         name:
           description: コンポーネント名
@@ -1706,9 +1706,9 @@ components:
           description: コンポーネントの最大メモリ
           type: string
           example: 256Mi
-        datasource:
+        deploy_source:
           description: コンポーネントを構成するソース
-          $ref: "#/components/schemas/handler.ApplicationComponentDataSource"
+          $ref: "#/components/schemas/handler.ApplicationComponentDeploySource"
         env:
           description: コンポーネントに渡す環境変数
           type: array
@@ -1717,13 +1717,13 @@ components:
         probe:
           description: コンポーネントのプローブ設定
           $ref: "#/components/schemas/handler.ApplicationComponentProbe"
-    handler.ApplicationComponentDataSource:
+    handler.ApplicationComponentDeploySource:
       type: object
       properties:
         container_registry:
           description: コンテナレジストリ
-          $ref: "#/components/schemas/handler.ApplicationComponentDataSourceContainerRegistry"
-    handler.ApplicationComponentDataSourceContainerRegistry:
+          $ref: "#/components/schemas/handler.ApplicationComponentDeploySourceContainerRegistry"
+    handler.ApplicationComponentDeploySourceContainerRegistry:
       type: object
       required:
         - image

diff --git a/apis/v1/spec/original-openapi.json b/apis/v1/spec/original-openapi.json
diff --git a/apis/v1/zz_types_gen.go b/apis/v1/zz_types_gen.go
diff --git a/example_test.go b/example_test.go
@@ -65,8 +65,8 @@ func Example_applicationAPI() {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},
@@ -122,8 +122,8 @@ func Example_versionAPI() {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},
@@ -204,8 +204,8 @@ func Example_trafficAPI() {
 				Name:      "component1",
 				MaxCpu:    "0.1",
 				MaxMemory: "256Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image: "apprun-test.sakuracr.jp/apprun/test1:latest",
 					},
 				},

diff --git a/fake/applications.go b/fake/applications.go
@@ -102,11 +102,11 @@ func (engine *Engine) CreateApplication(reqBody *v1.PostApplicationBody) (*v1.Ap
 
 	var components []v1.HandlerApplicationComponent
 	for _, reqComponent := range reqBody.Components {
-		var cr v1.HandlerApplicationComponentDataSourceContainerRegistry
-		if reqComponent.Datasource.ContainerRegistry != nil {
-			cr.Image = reqComponent.Datasource.ContainerRegistry.Image
-			cr.Server = reqComponent.Datasource.ContainerRegistry.Server
-			cr.Username = reqComponent.Datasource.ContainerRegistry.Username
+		var cr v1.HandlerApplicationComponentDeploySourceContainerRegistry
+		if reqComponent.DeploySource.ContainerRegistry != nil {
+			cr.Image = reqComponent.DeploySource.ContainerRegistry.Image
+			cr.Server = reqComponent.DeploySource.ContainerRegistry.Server
+			cr.Username = reqComponent.DeploySource.ContainerRegistry.Username
 		}
 
 		var env []v1.HandlerApplicationComponentEnv
@@ -138,7 +138,7 @@ func (engine *Engine) CreateApplication(reqBody *v1.PostApplicationBody) (*v1.Ap
 		component.Name = reqComponent.Name
 		component.MaxCpu = string(reqComponent.MaxCpu)
 		component.MaxMemory = string(reqComponent.MaxMemory)
-		component.Datasource.ContainerRegistry = &cr
+		component.DeploySource.ContainerRegistry = &cr
 		component.Env = &env
 		component.Probe = &probe
 		components = append(components, component)
@@ -214,11 +214,11 @@ func (engine *Engine) UpdateApplication(id string, reqBody *v1.PatchApplicationB
 	if reqBody.Components != nil && len(*reqBody.Components) > 0 {
 		var components []v1.HandlerApplicationComponent
 		for _, reqComponent := range *reqBody.Components {
-			var cr v1.HandlerApplicationComponentDataSourceContainerRegistry
-			if reqComponent.Datasource.ContainerRegistry != nil {
-				cr.Image = reqComponent.Datasource.ContainerRegistry.Image
-				cr.Server = reqComponent.Datasource.ContainerRegistry.Server
-				cr.Username = reqComponent.Datasource.ContainerRegistry.Username
+			var cr v1.HandlerApplicationComponentDeploySourceContainerRegistry
+			if reqComponent.DeploySource.ContainerRegistry != nil {
+				cr.Image = reqComponent.DeploySource.ContainerRegistry.Image
+				cr.Server = reqComponent.DeploySource.ContainerRegistry.Server
+				cr.Username = reqComponent.DeploySource.ContainerRegistry.Username
 			}
 
 			var env []v1.HandlerApplicationComponentEnv
@@ -250,7 +250,7 @@ func (engine *Engine) UpdateApplication(id string, reqBody *v1.PatchApplicationB
 			component.Name = reqComponent.Name
 			component.MaxCpu = string(reqComponent.MaxCpu)
 			component.MaxMemory = string(reqComponent.MaxMemory)
-			component.Datasource.ContainerRegistry = &cr
+			component.DeploySource.ContainerRegistry = &cr
 			component.Env = &env
 			component.Probe = &probe
 			components = append(components, component)

diff --git a/fake/applications_test.go b/fake/applications_test.go
@@ -102,7 +102,7 @@ func TestEngine_Application(t *testing.T) {
 					"name": "component1",
 					"max_cpu": "0.2",
 					"max_memory": "512Mi",
-					"datasource": {
+					"deploy_source": {
 						"container_registry": {
 							"image": "apprun-example.sakuracr.jp/helloworld:latest",
 							"server": "apprun-example.sakuracr.jp",
@@ -161,7 +161,7 @@ func TestEngine_Application(t *testing.T) {
 					"name": "component1",
 					"max_cpu": "0.2",
 					"max_memory": "512Mi",
-					"datasource": {
+					"deploy_source": {
 						"container_registry": {
 							"image": "apprun-example.sakuracr.jp/helloworld:latest",
 							"server": "apprun-example.sakuracr.jp",
@@ -253,8 +253,8 @@ func postApplicationBody() *v1.PostApplicationBody {
 				Name:      "component1",
 				MaxCpu:    "0.2",
 				MaxMemory: "512Mi",
-				Datasource: v1.PostApplicationBodyComponentDataSource{
-					ContainerRegistry: &v1.PostApplicationBodyComponentDataSourceContainerRegistry{
+				DeploySource: v1.PostApplicationBodyComponentDeploySource{
+					ContainerRegistry: &v1.PostApplicationBodyComponentDeploySourceContainerRegistry{
 						Image:    "apprun-example.sakuracr.jp/helloworld:latest",
 						Server:   &server,
 						Username: &userName,

diff --git a/fake/versions_test.go b/fake/versions_test.go
@@ -115,7 +115,7 @@ func TestEngine_Version(t *testing.T) {
 					"name": "component1",
 					"max_cpu": "0.2",
 					"max_memory": "512Mi",
-					"datasource": {
+					"deploy_source": {
 						"container_registry": {
 							"image": "apprun-example.sakuracr.jp/helloworld:latest",
 							"server": "apprun-example.sakuracr.jp",