Merge branch 'release/v2.4.0'

Creatiwity · May 2, 2022 · ea7d452 · ea7d452
2 parents 3cfa8d2 + de04799
commit ea7d452
Show file tree

Hide file tree

Showing 16 changed files with 359 additions and 152 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sirene"
-version = "2.3.1"
+version = "2.4.0"
 authors = ["Julien Blatecky <[email protected]>"]
 edition = "2021"
 
@@ -19,12 +19,12 @@ r2d2 = "0.8"
 reqwest = { version = "0.11", features = ["json", "stream"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-tokio = { version = "1.17", features = ["macros", "io-util", "fs", "rt-multi-thread", "time"] }
+tokio = { version = "1.18", features = ["macros", "io-util", "fs", "rt-multi-thread", "time"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 warp = { version = "0.3", default-features = false }
-zip = "0.5"
+zip = "0.6"
 
 [target.'cfg(any(unix, linux))'.dependencies]
 openssl = "0.10"
diff --git a/app/Chart.lock b/app/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 10.3.13
 digest: sha256:9714003674edfea39d7b735dccd8078a5011b17bcd8de8c7ddcc76563126d6f8
-generated: "2021-03-29T18:09:00.874362+02:00"
+generated: "2022-03-15T16:49:31.854028+01:00"
diff --git a/app/Chart.yaml b/app/Chart.yaml
@@ -21,7 +21,7 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.3.1"
+appVersion: "v2.4.0"
 
 dependencies:
     - name: postgresql

diff --git a/app/templates/cronjob.yaml b/app/templates/cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ include "app.fullname" . }}

diff --git a/app/templates/deployment.yaml b/app/templates/deployment.yaml
@@ -66,11 +66,11 @@ spec:
           livenessProbe:
             httpGet:
               path: /
-              port: 3000
+              port: http
           readinessProbe:
             httpGet:
               path: /
-              port: 3000
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/app/templates/ingress.yaml b/app/templates/ingress.yaml
@@ -1,7 +1,14 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "app.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -16,6 +23,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}
@@ -33,9 +43,19 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else }}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
+              {{- end }}
           {{- end }}
     {{- end }}
-  {{- end }}
+{{- end }}
diff --git a/app/templates/service.yaml b/app/templates/service.yaml
@@ -8,7 +8,7 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: 3000
+      targetPort: http
       protocol: TCP
       name: http
   selector:

diff --git a/app/values.yaml b/app/values.yaml
@@ -49,16 +49,15 @@ service:
 
 ingress:
   enabled: false
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
     - host: siren-api.local
       paths:
         - path: /
-          backend:
-            serviceName: siren-api.local
-            servicePort: 80
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: siren-api-tls
   #    hosts:
@@ -82,17 +81,17 @@ postgresql:
     accessModes:
       - ReadWriteMany
 
-resources:
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  limits:
-    cpu: 100m
-    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 128Mi
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
 
 autoscaling:
   enabled: false

diff --git a/migrations/2022-05-02-152102_add_societe_mission_column/down.sql b/migrations/2022-05-02-152102_add_societe_mission_column/down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."unite_legale" DROP COLUMN "societe_mission";
+ALTER TABLE "public"."unite_legale_staging" DROP COLUMN "societe_mission";
diff --git a/migrations/2022-05-02-152102_add_societe_mission_column/up.sql b/migrations/2022-05-02-152102_add_societe_mission_column/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."unite_legale" ADD COLUMN "societe_mission" varchar(1) DEFAULT NULL;
+ALTER TABLE "public"."unite_legale_staging" ADD COLUMN "societe_mission" varchar(1) DEFAULT NULL;
diff --git a/src/connectors/insee/types/unite_legale.rs b/src/connectors/insee/types/unite_legale.rs
@@ -93,6 +93,7 @@ pub struct PeriodeInseeUniteLegale {
     pub changement_economie_sociale_solidaire_unite_legale: bool,
     pub caractere_employeur_unite_legale: Option<String>,
     pub changement_caractere_employeur_unite_legale: bool,
+    pub societe_mission_unite_legale: Option<String>,
 }
 
 impl From<&InseeUniteLegale> for Option<UniteLegale> {
@@ -148,6 +149,7 @@ impl From<InseeUniteLegaleWithPeriode> for UniteLegale {
             nic_siege: u.periode.nic_siege_unite_legale,
             economie_sociale_solidaire: u.periode.economie_sociale_solidaire_unite_legale,
             caractere_employeur: u.periode.caractere_employeur_unite_legale,
+            societe_mission: u.periode.societe_mission_unite_legale,
         }
     }
 }

diff --git a/src/models/schema.rs b/src/models/schema.rs
@@ -156,6 +156,7 @@ table! {
         nic_siege -> Nullable<Text>,
         economie_sociale_solidaire -> Nullable<Text>,
         caractere_employeur -> Nullable<Varchar>,
+        societe_mission -> Nullable<Varchar>,
     }
 }
 
@@ -194,6 +195,7 @@ table! {
         nic_siege -> Nullable<Text>,
         economie_sociale_solidaire -> Nullable<Text>,
         caractere_employeur -> Nullable<Varchar>,
+        societe_mission -> Nullable<Varchar>,
     }
 }
 

diff --git a/src/models/unite_legale/columns.rs b/src/models/unite_legale/columns.rs
@@ -31,5 +31,6 @@ activite_principale,
 nomenclature_activite_principale,
 nic_siege,
 economie_sociale_solidaire,
-caractere_employeur
+caractere_employeur,
+societe_mission
 "#;
diff --git a/src/models/unite_legale/common.rs b/src/models/unite_legale/common.rs
@@ -38,4 +38,5 @@ pub struct UniteLegale {
     pub nic_siege: Option<String>,
     pub economie_sociale_solidaire: Option<String>,
     pub caractere_employeur: Option<String>,
+    pub societe_mission: Option<String>,
 }
diff --git a/src/models/unite_legale/mod.rs b/src/models/unite_legale/mod.rs
@@ -173,6 +173,7 @@ impl UpdatableModel for UniteLegaleModel {
                 dsl::nic_siege.eq(excluded(dsl::nic_siege)),
                 dsl::economie_sociale_solidaire.eq(excluded(dsl::economie_sociale_solidaire)),
                 dsl::caractere_employeur.eq(excluded(dsl::caractere_employeur)),
+                dsl::societe_mission.eq(excluded(dsl::societe_mission)),
             ))
             .execute(&connection)?;