APPS-11763: VPC integration (#1059)

* APPS-11763: VPC integration

* Update the egress ip yml file

* Add VPC integration into the AppSpec

* Fix VPC array in the AppSpec

* Remove type array from app for vpc

* Make lint happy

* Update create and update request

* Update description

* Update req body upon feedback

* Update type as object

* Fix lint test

* Keep separate file for egress

* Update struct of vpc

---------

Co-authored-by: anup-deka <adeka@digitalocean.com>

Author: ShivaniKumar1

specification/resources/apps/apps_create.yml

@@ -39,6 +39,8 @@ requestBody:
                 - path: /api
           egress:
             type: DEDICATED_IP
+          vpc:
+            id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
   required: true
 
 responses:

specification/resources/apps/examples/python/apps_update.yml

@@ -225,6 +225,8 @@ source: |-
                 "version": "12",
             }
         ],
-    }
+        “vpc”: {
+            “id”: “c22d8f48-4bc4-49f5-8ca0-58e7164427ac”,
+        }
     }
     update_resp = client.apps.update(id="bb245ba", body=req)

specification/resources/apps/models/app.yml

@@ -87,6 +87,8 @@ properties:
     type: array
     items:
       $ref: apps_dedicated_egress_ip.yml
+  vpc:
+    $ref: apps_vpc.yml
 required:
 - spec
 type: object

specification/resources/apps/models/app_spec.yml

@@ -102,6 +102,9 @@ properties:
 
   maintenance:
     $ref: app_maintenance_spec.yml
+  
+  vpc:
+    $ref: apps_vpc.yml
 
 required:
 - name

specification/resources/apps/models/apps_vpc.yml

@@ -0,0 +1,12 @@
+type: object
+readOnly: true
+properties:
+  id:
+    title: The ID of the VPC. 
+    type: string
+    example: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+  egress_ips:
+    title: The egress ips associated with the VPC.
+    type: array
+    items:
+      $ref: apps_vpc_egress_ip.yml

specification/resources/apps/models/apps_vpc_egress_ip.yml

@@ -0,0 +1,5 @@
+type: object
+properties:
+  ip:
+    type: string
+    example: 10.0.0.1

specification/resources/apps/responses/examples.yml

@@ -22,6 +22,10 @@ apps:
             type: "PRIMARY"
             zone: "example.com"
             minimum_tls_version: "1.3"
+          vpc:
+            id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+            egress_ips:
+              - ip: 10.0.0.1
         default_ingress: https://sample-php-iaj87.ondigitalocean.app
         created_at: 2020-11-19T20:27:18Z
         updated_at: 2020-12-01T00:42:16Z
@@ -47,6 +51,10 @@ apps:
                 type: "PRIMARY"
                 zone: "example.com"
                 minimum_tls_version: "1.3"
+            vpc:
+              id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+              egress_ips:
+                - ip: 10.0.0.1
           services:
             - name: sample-php
               source_commit_hash: 54d4a727f457231062439895000d45437c7bb405
@@ -76,6 +84,10 @@ apps:
                 type: "PRIMARY"
                 zone: "example.com"
                 minimum_tls_version: "1.3"
+            vpc:
+              id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+              egress_ips:
+                - ip: 10.0.0.1
           services:
             - name: sample-php
               source_commit_hash: 54d4a727f457231062439895000d45437c7bb405
@@ -199,6 +211,10 @@ apps:
           - ip: 192.168.1.2
             id: 4768fb15-2837-4dda-9be5-3951df4bc3d0
             status: ASSIGNED
+        vpc:
+          id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+          egress_ips:
+            - ip: 10.0.0.1
     links:
       pages: {}
     meta:
@@ -231,6 +247,10 @@ app:
         - domain: "sample-golang.example.com"
           zone: "example.com"
           minimum_tls_version: "1.3"
+        vpc:
+          id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+          egress_ips:
+            - ip: 10.0.0.1
       default_ingress: https://sample-golang-zyhgn.ondigitalocean.app
       created_at: '2021-02-10T16:45:14Z'
       updated_at: '2021-02-10T17:06:56Z'
@@ -255,6 +275,10 @@ app:
           - domain: "sample-golang.example.com"
             zone: "example.com"
             minimum_tls_version: "1.3"
+          vpc:
+            id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+            egress_ips:
+              - ip: 10.0.0.1
         services:
         - name: web
           source_commit_hash: db6936cb46047c576962962eed81ad52c21f35d7
@@ -340,6 +364,10 @@ app:
               type: "PRIMARY"
               zone: "example.com"
               minimum_tls_version: "1.3"
+          vpc:
+            id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+            egress_ips:
+              - ip: 10.0.0.1
       region:
         slug: ams
         label: Amsterdam
@@ -430,6 +458,10 @@ app:
         - ip: 192.168.1.2
           id: 4768fb15-2837-4dda-9be5-3951df4bc3d0
           status: ASSIGNED
+      vpc:
+        id: c22d8f48-4bc4-49f5-8ca0-58e7164427ac
+        egress_ips:
+          - ip: 10.0.0.1
 
 
 deployments: