Undo APIFlask.

.github/workflows/cd.infra.yaml

@@ -4,7 +4,7 @@ on:
   push:
     paths:
       - infra/**
-      - .github/workflows/ci.infra.yaml
+      - .github/workflows/cd.infra.yaml
     branches:
       - main
 

infra/app/main.tf

@@ -28,7 +28,7 @@ locals {
   image_base    = "${var.region}-docker.pkg.dev/${var.project}/${var.project}/"
   client_tag    = var.app_versions["client"]
   client_image  = "${local.image_base}client:${local.client_tag}"
-  painter_image = "${local.image_base}painter_api:${var.app_versions["painter_api"]}"
-  voting_tag    = var.app_versions["voting_api"]
-  voting_image  = "${local.image_base}voting_api:${local.voting_tag}"
+  painter_image = "${local.image_base}painterapi:${var.app_versions["painterapi"]}"
+  voting_tag    = var.app_versions["votingapi"]
+  voting_image  = "${local.image_base}votingapi:${local.voting_tag}"
 }

infra/app/variables.tf

@@ -2,8 +2,8 @@ variable "app_versions" {
   type = map(string)
   default = {
     client : "0.1.0",
-    voting_api : "0.1.1",
-    painter_api : "0.1.0",
+    votingapi : "0.1.1",
+    painterapi : "0.1.0",
   }
 
 }

voting_api/Makefile

@@ -3,9 +3,7 @@
 setup:
 	pip install --upgrade --user pipenv
 	pipenv install --dev
-
-generate-openapi:
-	pipenv run flask --app voting.api spec
+	npm install -g api-spec-converter
 
 run: run-api
 
@@ -19,7 +17,7 @@ testcase:
 	PIPENV_DOTENV_LOCATION=.env.test pipenv run pytest ${TESTS}
 
 deploy:
-	gcloud run deploy --source . voting_api
+	gcloud run deploy --source . votingapi
 
 clean:
 	find . -name '*~' -delete

voting_api/Pipfile

@@ -7,7 +7,6 @@ name = "pypi"
 flask = "*"
 google-cloud-storage = "*"
 gunicorn = "*"
-apiflask = {extras = ["yaml"], version = "*"}
 
 [dev-packages]
 pytest = "*"

voting_api/service.yaml

@@ -1,11 +1,11 @@
 apiVersion: serving.knative.dev/v1
 kind: Service
 metadata:
-  name: voting-api
+  name: votingapi
 spec:
   template:
     metadata:
-      name: ${REVISION_NAME}
+      name: ${IMAGE}
     spec:
       containers:
       - image: ${IMAGE}

voting_api/tests/test_api.py

@@ -1,4 +1,4 @@
 def test_get_health(client):
   response = client.get('/health')
-  assert b'OK' == response.data
+  assert 'OK' == response.json['status']
   assert 200 == response.status_code

voting_api/voting/api.py

@@ -1,39 +1,20 @@
-from pathlib import Path
-
-from apiflask import APIFlask
-from flask import jsonify, request
+from flask import Flask jsonify, request
 
+from voting.model import art
 from voting.storage import art_storage
 
 
 def create_app():
-  app = APIFlask(__name__, title='Artist 2D Voting API', spec_path='/openapi.yaml')
+  app = Flask(__name__)
   return app
 
 
 app = create_app()
-app.config.update({
-  'AUTO_SERVERS': False,
-  'LOCAL_SPEC_PATH': Path(app.root_path) / 'openapi.yaml',
-  'OPENAPI_VERSION': '2.0',
-  'SPEC_FORMAT': 'yaml',
-  'SYNC_LOCAL_SPEC': True,
-})
-
-
-@app.spec_processor
-def google_endpoints_spec(spec):
-    spec['host'] = 'gateway-c24bw3cnyq-wl.a.run.app'
-    spec['x-google-backend'] = {
-      'address': 'voting-api',
-      'protocol': 'h2',
-    }
-    return spec
-
-
-@app.get("/health")
+
+
+@app.route("/health")
 def health_check():
-  return 'OK'
+  return jsonify({'status': 'OK'})
 
 
 @app.get("/art")