Merge pull request #47 from fiji-flo/picture-api

Add picture api domain and ingress.

Cargo.toml

@@ -11,7 +11,7 @@ nouid = []
 [dependencies]
 cis_client = { git = "https://github.com/fiji-flo/cis_client-rust", branch = "0.1.1", version = "0.1.1" }
 cis_profile = { git = "https://github.com/fiji-flo/cis_profile-rust", branch = "0.1.1", version = "0.1.1", features = ["graphql", "aws", "vendored"] }
-dino_park_gate = { git = "https://github.com/fiji-flo/dino-park-gate", branch = "future", version = "0.1.0-beta.3" }
+dino_park_gate = { git = "https://github.com/fiji-flo/dino-park-gate", branch = "0.1.0-beta.4", version = "0.1.0-beta.4" }
 actix-web = "1.0"
 actix-cors = "0.1"
 juniper = "0.13"

ci/install_deps.sh

@@ -1,7 +1,7 @@
 export RUSTUP_HOME=/usr/local/rustup
 export CARGO_HOME=/usr/local/cargo
 export PATH=/usr/local/cargo/bin:$PATH
-export RUST_VERSION=1.36.0
+export RUST_VERSION=1.37.0
 
 set -eux
 dpkgArch="$(dpkg --print-architecture)"

k8s/templates/ingress_pictures.yaml

@@ -0,0 +1,29 @@
+{{ if ne .Values.env "prod" }}
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: pictures-ingress
+  namespace: {{ .Values.namespace }}
+  annotations:
+    kubernetes.io/ingress.class: "nginx-{{ .Values.namespace }}"
+    ingress.kubernetes.io/limit-rps: "100"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/enable-modsecurity: "true"
+    nginx.ingress.kubernetes.io/enable-owasp-core-rules: "true"
+spec:
+  tls:
+  - hosts:
+    - {{ .Values.pictures_domain_name }}
+    secretName: pictures-secret
+  rules:
+  - host: {{ .Values.pictures_domain_name }}
+    http:
+      paths:
+      - path: /avatar/get/id/
+        backend:
+          serviceName: dino-park-fossil-service
+          servicePort: 80
+{{ end }}

k8s/values/dev.yaml

@@ -1,4 +1,5 @@
 env: dev
 namespace: dinopark-dev
 domain_name: dinopark.k8s.dev.sso.allizom.org
+pictures_domain_name: picture.api.dev.sso.allizom.org
 assume_role: arn:aws:iam::320464205386:role/dino-park-fence-role-dev-us-west-2

k8s/values/prod.yaml

@@ -2,6 +2,7 @@ env: prod
 namespace: dinopark-prod
 domain_name: people.mozilla.org
 secondary_domain_name: dinopark.k8s.sso.mozilla.com
+pictures_domain_name: picture.api.sso.mozilla.com
 assume_role: arn:aws:iam::320464205386:role/dino-park-fence-role-prod-us-west-2
 replicas: 3
 ingress_replicas: 5

k8s/values/test.yaml

@@ -1,4 +1,5 @@
 env: test
 namespace: dinopark-test
 domain_name: dinopark.k8s.test.sso.allizom.org
+pictures_domain_name: picture.api.test.sso.allizom.org
 assume_role: arn:aws:iam::320464205386:role/dino-park-fence-role-test-us-west-2

src/graphql_api/app.rs

@@ -35,7 +35,7 @@ fn graphql<T: AsyncCisClientTrait + Send + Sync>(
     data: Json<GraphQLRequest>,
     state: Data<GraphQlState<T>>,
     scope_and_user: ScopeAndUser,
-) -> Box<Future<Item = HttpResponse, Error = Error>> {
+) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
     info!(
         "graphql for {:?} → {:?}",
         &scope_and_user.user_id, &scope_and_user.scope