webhooks helm

Author: mcanoy

README.md

@@ -1,10 +1,10 @@
 ![Container Build](https://github.com/rht-labs/open-management-portal-git-api/workflows/Container%20Build/badge.svg)
 
-# Open Management Portal - Git API
+# LodeStar - Git API
 
-The Git API for the Open Management Portal.
+The Git API for LodeStar.
 
-This API uses GitLab as a repository to store OMP resources.
+This API uses GitLab as a repository to store LodeStar resources.
 
 ## JSON REST APIs
 
@@ -67,12 +67,15 @@ Deployment template will read from the above secret and inject following env var
 |------|---------------|----------|
 | CONFIG_REPOSITORY_ID | 1 | True |
 | CONFIG_FILE | my-config.yml | True |
+| CONFIG_GITLAB_REF | master | False |
+| WEBHOOK_FILE | webhooks.yml | False |
 
 ### Engagements Resource
 
 | Name | Example Value | Required |
 |------|---------------|----------|
 | ENGAGEMENTS_REPOSITORY_ID | 2 | True |
+| WEBHOOK_DEFAULT_TOKEN | tolkien | False | 
 
 ### Version Resource
 

deployment/templates/configmap-hook.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+data:
+  webhooks.yaml: |
+{{- range $hook := .Values.config.hooks }}
+    - name: {{ $hook.name }}
+      baseUrl: {{ $hook.baseUrl }}
+      token: {{ $hook.token }}
+      pushEvent: {{ $hook.pushEvent | default true }}
+      pushEventsBranchFilter: {{ $hook.pushEventsBranchFilter | default "master" }}
+{{- end }}
+kind: ConfigMap
+metadata:
+  name: hook-cm

deployment/templates/deploymentconfig.yaml

@@ -42,11 +42,18 @@ spec:
         resources: {}
         terminationMessagePath: /dev/termination-log
         terminationMessagePolicy: File
+        volumeMounts:
+        - name: hook-cm-volume
+          mountPath: {{ .Values.config.hookFile.path }}
       dnsPolicy: ClusterFirst
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
       terminationGracePeriodSeconds: 30
+      volumes:
+      - name: hook-cm-volume
+        configMap:
+          name: hook-cm
   test: false
   triggers:
   - type: ConfigChange

deployment/templates/gitlab-secret.yaml

@@ -11,4 +11,5 @@ stringData:
   GITLAB_API_URL: "{{ .Values.gitLabApiUrl }}"
   GITLAB_PERSONAL_ACCESS_TOKEN: "{{ .Values.gitLabPersonalAccessToken }}"
   ENGAGEMENTS_REPOSITORY_ID: "{{ .Values.engagementsRepositoryId }}"
+  WEBHOOK_FILE: "{{ .Values.config.hookFile.path }}/{{ .Values.config.hookFile.name }}"
 {{- end }}

deployment/values-dev.yaml

@@ -18,4 +18,17 @@ configRepositoryId: false
 deployKey: false
 gitLabApiUrl: false
 gitLabPersonalAccessToken: false
-engagementsRepositoryId: false
+engagementsRepositoryId: false
+
+config:
+  hookFile:
+    path: /schema
+    name: webhooks.yaml
+  hooks:
+    - name: hook1
+      baseUrl: http://localhost/hook1
+      token: ibaka
+    - name: hook2
+      baseUrl: http://localhost/hook2
+      token: anunoby
+      

src/main/resources/application.properties

@@ -27,7 +27,7 @@ gitlab.deploy.key=${DEPLOY_KEY:0}
 # config 
 config.repository.id=${CONFIG_REPOSITORY_ID:1}
 config.file=${CONFIG_FILE:schema/config.yml}
-webhook.file=${LODESTAR_WEBHOOK_FILE:/schema/webhooks.yaml}
+webhook.file=${WEBHOOK_FILE:/schema/webhooks.yaml}
 webhook.default.token=${WEBHOOK_DEFAULT_TOKEN:tolkien}
 config.gitlab.ref=${CONFIG_GITLAB_REF:master}
 

src/test/java/com/redhat/labs/omp/resource/EngagementResourceTest.java

@@ -62,7 +62,7 @@ public void testGetWebhooksSuccess() {
         given()
             .when()
                 .contentType(ContentType.JSON)
-                .get("/api/v1/engagements/jello/lemon/hooks")
+                .get("/api/v1/engagements/customer/jello/lemon/hooks")
             .then()
                 .statusCode(200)
                 .body(is("[{\"id\":13,\"project_id\":99,\"push_events\":true,\"push_events_branch_filter\""
@@ -75,7 +75,7 @@ public void testCreateProjectHookSuccess() {
             .when()
                 .contentType(ContentType.JSON)
                 .body("{\"push_events\": true, \"url\": \"https://lodestar/webhooks/blah\"}")
-                .post("/api/v1/engagements/jello/tutti-frutti/hooks")
+                .post("/api/v1/engagements/customer/jello/tutti-frutti/hooks")
             .then()
                 .statusCode(201);
     }