From 46e6e52845e2b9ee6e00bd46f20d072eeb382261 Mon Sep 17 00:00:00 2001
From: Jack Stockley <jack.stockley@digital.justice.gov.uk>
Date: Tue, 22 Nov 2022 11:06:52 +0000
Subject: [PATCH] feat(helm): Update templates

---
 Dockerfile                                    |  34 +++--
 helm/cycling-blog/templates/cycling-app.yaml  |  26 +---
 .../templates/cycling-db-job.yaml             |  63 ++++++++
 helm/cycling-blog/templates/cycling-db.yaml   |  26 +---
 .../cycling-blog/templates/db-create-job.yaml |  44 ------
 .../cycling-blog/templates/db-insert-job.yaml |  44 ------
 helm/cycling-blog/values-dev.yaml             | Bin 1723 -> 2061 bytes
 helm/cycling-blog/values-local.yaml           | Bin 1446 -> 2476 bytes
 helm/cycling-blog/values-stg.yaml             | Bin 1723 -> 2054 bytes
 helm/cycling-blog/values-test.yaml            | Bin 1727 -> 2056 bytes
 po-lint/po-linter.go                          | 138 ------------------
 11 files changed, 96 insertions(+), 279 deletions(-)
 create mode 100644 helm/cycling-blog/templates/cycling-db-job.yaml
 delete mode 100644 helm/cycling-blog/templates/db-create-job.yaml
 delete mode 100644 helm/cycling-blog/templates/db-insert-job.yaml
 delete mode 100644 po-lint/po-linter.go

diff --git a/Dockerfile b/Dockerfile
index 80ec7fa..59dedce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,40 @@
-FROM golang:1.17.8-alpine3.15
+FROM golang:1.19.3-alpine3.16
 
-RUN apk add git
-RUN apk add postgresql-client
+ENV \
+    CGO_ENABLED=0 \
+    GOOS=linux
 
-RUN go get -u github.com/lib/pq
-RUN go get -u github.com/joho/godotenv
+RUN apk add postgresql-client
 
 RUN addgroup -g 1000 -S appgroup && \
     adduser -u 1000 -S appuser -G appgroup
 
 WORKDIR /app
 
-COPY . . 
+COPY go.mod /app
+COPY go.sum /app
+COPY main.go /app
+COPY sql /app
+COPY static /app
+COPY templates /app
+COPY .env_db /app
+COPY .env_app /app
+
+RUN chown -R appuser:appgroup /app
+RUN chown -R appuser:appgroup /go/bin
+USER 1000
+
+RUN go mod download 
 
 RUN echo ${PGPASSFILE} > /home/appuser/.pgpass && \
     chown appuser:appgroup /home/appuser/.pgpass && \
     chmod 0600 /home/appuser/.pgpass
- 
-RUN chown -R appuser:appgroup /app
-RUN chown -R appuser:appgroup /go
-
-USER 1000
 
 # Build the Go app
-RUN go build -o main .
+RUN go build -ldflags "-s -w" -o /go/bin/cycling_blog -buildvcs=false
 
 # Expose port 8080 to the outside world
 EXPOSE 8080
 
 # Command to run the executable
-CMD ["./main"]
+CMD ["cycling_blog"]
diff --git a/helm/cycling-blog/templates/cycling-app.yaml b/helm/cycling-blog/templates/cycling-app.yaml
index eea62f7..f491c60 100644
--- a/helm/cycling-blog/templates/cycling-app.yaml
+++ b/helm/cycling-blog/templates/cycling-app.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ .Values.app_deployment.app }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.app_deployment.replicas }}
   selector:
     matchLabels:
       app: {{ .Values.app_deployment.app }}
@@ -29,24 +29,10 @@ spec:
         ports:
         - containerPort: {{ .Values.app_service.ports.port }}
         env:
-        - name: PGPASSFILE
+        {{- range .Values.db_env }}
+        - name: {{ .name }}
           valueFrom: 
             secretKeyRef:
-              name: pgpass
-              key: connect
-        - name: POSTGRES_USER
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: username
-        - name: PGPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: password
-        - name: POSTGRES_DB
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: db_name
-          
\ No newline at end of file
+              name: {{ .secretName }}
+              key: {{ .key }}
+        {{- end }}
\ No newline at end of file
diff --git a/helm/cycling-blog/templates/cycling-db-job.yaml b/helm/cycling-blog/templates/cycling-db-job.yaml
new file mode 100644
index 0000000..9f6dc03
--- /dev/null
+++ b/helm/cycling-blog/templates/cycling-db-job.yaml
@@ -0,0 +1,63 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.cycling_blog_db_create.name }}
+  namespace: {{ .Values.namespace }}
+  labels: 
+    app: {{ .Values.cycling_blog_db_create.app }}
+  annotations:
+    # This is what defines this resource as a hook. Without this line, the
+    # job is considered part of the release.
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": {{ .Values.annotations.hookDeletePolicy }}
+spec:
+  template:
+    spec:
+      containers:
+      - name: {{ .Values.cycling_blog_db_create.app }}
+        image: {{ .Values.app_deployment.template.containers.image }}
+        imagePullPolicy: {{ .Values.cycling_blog_db_create.template.containers.imagePullPolicy }}
+        command: ["psql"]
+        args: ["-h", "$(CYCLING_BLOG_DB_SERVICE_SERVICE_HOST)", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-w", "-a", "-f", "sql/create_table.sql"]
+        env:
+        {{- range .Values.db_env }}
+        - name: {{ .name }}
+          valueFrom: 
+            secretKeyRef:
+              name: {{ .secretName }}
+              key: {{ .key }}
+        {{- end }}
+      restartPolicy: {{ .Values.cycling_blog_db_create.template.restartPolicy }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ .Values.cycling_blog_db_insert.name }}
+  namespace: {{ .Values.namespace }}
+  labels: 
+    app: {{ .Values.cycling_blog_db_insert.app }}
+  annotations:
+    # This is what defines this resource as a hook. Without this line, the
+    # job is considered part of the release.
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "10"
+    "helm.sh/hook-delete-policy": {{ .Values.annotations.hookDeletePolicy }}
+spec:
+  template:
+    spec:
+      containers:
+      - name: {{ .Values.cycling_blog_db_insert.app }}
+        image: {{ .Values.app_deployment.template.containers.image }}
+        imagePullPolicy: {{ .Values.cycling_blog_db_insert.template.containers.imagePullPolicy }}
+        command: ["psql"]
+        args: ["-h", "$(CYCLING_BLOG_DB_SERVICE_SERVICE_HOST)", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-w", "-a", "-f", "sql/table_insert.sql"]
+        env:
+        {{- range .Values.db_env }}
+        - name: {{ .name }}
+          valueFrom: 
+            secretKeyRef:
+              name: {{ .secretName }}
+              key: {{ .key }}
+        {{- end }}
+      restartPolicy: {{ .Values.cycling_blog_db_insert.template.restartPolicy }}
\ No newline at end of file
diff --git a/helm/cycling-blog/templates/cycling-db.yaml b/helm/cycling-blog/templates/cycling-db.yaml
index 3120e34..41d187b 100644
--- a/helm/cycling-blog/templates/cycling-db.yaml
+++ b/helm/cycling-blog/templates/cycling-db.yaml
@@ -28,24 +28,10 @@ spec:
         ports:
         - containerPort: {{ .Values.db_service.ports.port }}
         env:
-        - name: POSTGRES_USER
-          valueFrom:
+        {{- range .Values.db_env }}
+        - name: {{ .name }}
+          valueFrom: 
             secretKeyRef:
-              name: pgpass
-              key: username
-        - name: POSTGRES_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: password
-        - name: POSTGRES_DB
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: db_name
-        - name: HOSTNAME
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: hostname
-
+              name: {{ .secretName }}
+              key: {{ .key }}
+        {{- end }}
diff --git a/helm/cycling-blog/templates/db-create-job.yaml b/helm/cycling-blog/templates/db-create-job.yaml
deleted file mode 100644
index 1b0ec28..0000000
--- a/helm/cycling-blog/templates/db-create-job.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: cycling-blog-app-create
-  namespace: {{ .Values.namespace }}
-  labels: 
-    app: cycling-blog-app
-  annotations:
-    # This is what defines this resource as a hook. Without this line, the
-    # job is considered part of the release.
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "5"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    spec:
-      containers:
-      - name: cycling-blog-app
-        image: jackstock8904/cycling-blog:latest
-        imagePullPolicy: Always
-        command: ["psql"]
-        args: ["-h", "$(CYCLING_BLOG_DB_SERVICE_SERVICE_HOST)", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-w", "-a", "-f", "sql/create_table.sql"]
-        env:
-        - name: PGPASSFILE
-          valueFrom: 
-            secretKeyRef:
-              name: pgpass
-              key: connect
-        - name: POSTGRES_USER
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: username
-        - name: PGPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: password
-        - name: POSTGRES_DB
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: db_name
-      restartPolicy: Never
\ No newline at end of file
diff --git a/helm/cycling-blog/templates/db-insert-job.yaml b/helm/cycling-blog/templates/db-insert-job.yaml
deleted file mode 100644
index 454cd12..0000000
--- a/helm/cycling-blog/templates/db-insert-job.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: cycling-blog-app-insert
-  namespace: {{ .Values.namespace }}
-  labels: 
-    app: cycling-blog-app
-  annotations:
-    # This is what defines this resource as a hook. Without this line, the
-    # job is considered part of the release.
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "10"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec: 
-  template:
-    spec:
-      containers:
-      - name: cycling-blog-app
-        image: jackstock8904/cycling-blog:latest
-        imagePullPolicy: Always
-        command: ["psql"]
-        args: ["-h", "$(CYCLING_BLOG_DB_SERVICE_SERVICE_HOST)", "-U", "$(POSTGRES_USER)", "-d", "$(POSTGRES_DB)", "-w", "-a", "-f", "sql/table_insert.sql"]
-        env:
-        - name: PGPASSFILE
-          valueFrom: 
-            secretKeyRef:
-              name: pgpass
-              key: connect
-        - name: POSTGRES_USER
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: username
-        - name: PGPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: password
-        - name: POSTGRES_DB
-          valueFrom:
-            secretKeyRef:
-              name: pgpass
-              key: db_name
-      restartPolicy: Never
\ No newline at end of file
diff --git a/helm/cycling-blog/values-dev.yaml b/helm/cycling-blog/values-dev.yaml
index 8f66d24aeed97904a755caeeecfa474e8094d639..50c0ee593b1d8759986bd3c7ab230f95fe6e003c 100644
GIT binary patch
literal 2061
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

literal 1723
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
Re$A(#O6Zs6T9#(5J;@qISzG`B

diff --git a/helm/cycling-blog/values-local.yaml b/helm/cycling-blog/values-local.yaml
index b5babbf4d6280e8b87c65258e17c03ad6a4055e1..e590626ccb46991ef06f825e18ec52ed73539b06 100644
GIT binary patch
literal 2476
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

literal 1446
zcmV;X1zGw4M@dveQdv+`00<$!BVv%Lch>#aOo28uS%{L-<>kf$2V{KeD;Ok`KKuT{
z6;QKQ=+fQZFskhhp7tc2wm7QI_zDx{T(9cMPsK@g9`HrC@Q>_XN*SrIs%TERqfK(L
z=3{$r>`DJmP$I#;E^=Hbm4N!{_Uy7x8qQ>knFe~L`h>AFLYfzaROz~xn-rt|DHQ*w
zO+DK8ry<1aW>!)kv8C1rFGLM{N0&YJ?O5>t&s%^6=ZSkw$N+W8?&E8{l(>Ss^WH`U
zbbV}^J--k8hCSu2Dz+<8e(yAI9YF16og1lk(%{;)mnE}=zjdg+wH26q^AZUy8U5T@
z7{|b>h_Z%I(%`-3#riE+{NrU|!{zL1VBw}VAp&~f^2mY+No0giImJL4A=A#(c-t_R
zRxSwDm_&s`%Cef$jKP`IZr&1LwwLJ!gF6I2C)ted3%U-^Tss6L+#EXv>7IDmGnKoE
zf}dTI^3Uh3^xD{lJM0UaxpxQp;${T4haU>gB!Di~yiSG`@?0;xTcp5TBQMO{wnZCx
zz(qPI!^{^9D20|HP^)xnU#cfF7&-s&*&Q#j$UH%O2_yFOa_su@O8Rb0RvJ8it+k(P
ztDh%$Wt8^v`gpaDmr!L>?Hp?e$p#9BgA}z!+>JiHk9TZYWkGl)ej`EljlIp_3GY4k
zp|}!7MP!6m)L)lW+nIhL+!pA*vDbybPxOmia=?JBjA${KeS{s6*CH3Fig6K!QsYO%
z+%V!SYyO{d?Bvt`i=}y7)4YST!3NVOHn=^TFIgy_)SRa2b;5VTJDE~)kf7QRTU^u}
z=~}YMiMi#}5%IH_;NYCm;OWQZzwbwZG_H~8Ob=I-CV!x<2%{^-LF94fKxX4|r%h5=
zMhs?$n=`8!+|HjRd2W`ZEP$**y2~dEqRv}2WQQ27ML(3J!2j5naHeIJhV|u|*m26W
z^Qewu>vu_o{VyfNTs?);T?BSgOF-$|tGM`%>9sD5KaBdvUVVN=FF}?o{@;t#>hedp
zR7Kt&25lQvNF4kOncvyfdUcyD&Vfe6!2do&SW&q&jHQq!-{n0)xJi4IV9t#b+Vh-h
zBd(q|6}sB*9haq3D$&ifC!J_K^9vN%E`new{RBr;IK{`iWN-BSby7S5LFf1-CKJc;
zZ<;_UH1KQh(@s1Wy7;I_&4Ax7rwp*#w-rsBqM9cAY1|5598zbQGUuMi%4zP(E>)(Z
zsE<Z!o!6?7f>%zy<8iL(<p7aTBwikYnV@l)46vN|xjV?A53@>zZOmetdVJbF^TAQ?
z>5pXBZm-Alla*Z{TI?0-0=Iv0xeSrM9X$UB2ZkolB576ZbLR`$0=wEBU~hU^U<`Hc
z^-5jA=iGrr2_If(JC<V{*N`}Ec6Gbrge;A6JH#p+$~iwwlOp4lPvb_vCWEdv^t%nJ
z-fWhP0qrj^Zuu-q7eV!7?@BS^BB?#JdVqfpw{%mQS89ows`c_~w(PC!nr8c>0A~sl
z*IT6?hP0NK?+fh}WO2y;@NsvRVpF8|Vn7%;Cjr*}QW?A869?>GnCc@NLq;ZmOcde+
zhpGT6tx0ka*=Hb?;emWH4P~f?KB2W02}@(TD`ei6Qd7>JxYRrWk~;bmV;RZsNG6Cm
z5e#O@uG_G`qJ-IqH0afW-}=$+?WQbAJNqK%T5L6sH$zk+zDF)9a@}(1;L>!ei|j46
z$39IrCTV22ZY_`al;^vr!FX-5>{_0l6U=1ys=;@SFg$`GUX)0Wa>%srk?WqV^}vb~
z)0c}4p>0UI6T1F!7xKAf+8Vt~Rb$*^l{q>{cu?QT!9;Gec6WRhF9#A(H`D0k1{|py
zotBBHb+rgE@X+;t0zH@qzq@E{HT@I2<3jsm?_tQ*4|iw5M=|%YiILh`K-29W*sw<A
AkpKVy

diff --git a/helm/cycling-blog/values-stg.yaml b/helm/cycling-blog/values-stg.yaml
index 9aac3ebd0bf087fb18b3fe0b06b0b216e1b19b62..8cfdbc67a43d09af9459b7c30255095d26c1750b 100644
GIT binary patch
literal 2054
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

literal 1723
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
R1C&~E6GJ}v#fb%YLhQc>UrPW0

diff --git a/helm/cycling-blog/values-test.yaml b/helm/cycling-blog/values-test.yaml
index 2cdb8ef185ab3a6b43a736ac608a124e58c2e536..c650adad08cad29864341aba8b894030ce78cd8a 100644
GIT binary patch
literal 2056
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

literal 1727
zcmV;w20-}$M@dveQdv+`0K{l`(%ZRKGmh0j2$yF%^&|JV<m`*|IADUG1}@Z9TELY7
zQv=4C3S)MH@2!&@g`>y$%-Dca*?AptLL3d2#NL+;g;LpYqFxI}JQnP{o9T?(3|sqn
zv;i_@r;|DG&lo07r$7b81(r#3C_QJVkud=d46kOc5fm#=UVuaRIgMI81Y*~rzJ_#d
z_^9#i7r78W8u?2MUwd7v5t=Z{6gJM9U0i!bV4+wN^f5c9C-Kgq5e9+vgZ>uC5<bHH
z5SO<cCbLcXQ#Al)Te6k5jB?%_t9Na^N%sI*H(SvuYHe~bvX=4%;0BH>H<yn>2GyUh
z<h9K5CbnA}=3xUiI#WTQQmNMBBt8OIA95qOjF$MR3)zrHLWM1j3aWv@s8*+(Q@WS`
zx6PS8Ss;43$vbMsI_$E36<9}i#c)3Y`A|>WgnrVHAtLHkOu5ml4LF54yFTjsrQJxL
zq9rR0P{eMgs}e`=J;Y<R7`v}@QJbI#Qe?t5<IK+K!CA;u@Z<>g=*Rs#*|WbQ!l1z$
zAEm&^w377h#!I}Wu$Hl{(zHWR9BK8W%jFgZrY$uq4?sPz7Wz&fL+K2(PG;)iM<#c$
zTFgRAeqCxdJ1m0s`t3(A>1Y*e`$Fs2@fzjM<HUgYa5z_D>Z@>q^y)mixYysXqlR1_
zeej$7ugbt~*0njSM~KzUa$ovnki#@KlfPX0d3V%?(-*jtZJPZsA24y|yJ*WeRJ`wH
zvf=8oyzmexm{tEYaDf6jj2l7+Vm=Z$0yKc}E7lo~!DW-IM>D%0Op<bVTv2!Vbbw6x
zNlURvJ!q=C&y1P7qBgO`5Q2f?as2|e;ewn3WMjDg^y&L#a6~-bMU5THIahiie$Rn^
z^5jCkai2uuJeQ{Pp=F&^bm0U))K$MJVYqL%f>24P20E@tp|hkp*YM&?q%R(MkTPA@
z5~l6PhG!>G5-Y3ofi>|X!mSuc^_E-USXaS7br%ObfUD`pFtj5zdtk+W_u}DCB6WBm
z0rYnNLxoxDU>q~9snaunVXTDD?CNH@s}dhmHW)WUtF?C--Y@|;bGLN_1r4?*5<z^;
z5oG?$FrjOaM-wrRL{N)IY+AWRz}A5gnz0Ykp#;SQGQzcQ4)(^b`-KirM_i3Da_Q#=
zmK8=Pop+#W4?cml#puNsN&z3;Ga@_NHHpH^HEzo-5jvi+%Y&N8{CAJkBB9IdVj59a
z`5y?qgx9v%M2ASHbY<^88+1d?&J+^I@YDM_rK~I6Rs!y=CnfLgDwQKY@jqhH=LPV;
zBuBve>n(BGKkg4kzT$KfLqq3s@zaYPE+hj1sw9u5(?&nhN~-4dtK46iPbQsSG|DTC
z57P>%Syc<uA0}1EK_<Gi=n4!ou9h23DYzVGD8+;~s!GB!egD}TV-_8g2_WIGJ-o=D
zdoOl^@oV%ktZK20j}X^snj<isK0bog--d@XmQdJ5A}oQu8H!+8r?<ku?@;ea=_NWi
zAv6#!sH-`y4SU(qP2W}B=nx#yO-f{IzoDSJR0T7+GRoCgV=}37u^v~r0uU&clW~~y
zR7w2_f0bZC_LvYhb*#*BkLKV=4AxX90MBgxEftScv5sHji0xSi#yhIIXDPQ~FyWRx
zdJM3a%U?q&^X)kM(ud55X{y|uybm{8FX8>1x7bt2tmKGTW|kp^<kXnLAa-3_Na9_A
z7UH^>U-CbP(v*-xIZRi%)*YIRl+D*LBO$SQB~Qc@3w@@@ci2NGG_w4ASsMS%+w|g2
zUWY9~w|)KrZAHO{V(5G^e>eSwyhTqi&BtrI_R{eJfw4X`DR`2s_iEwNba!Xhe$Rcz
zL13C3vlke{y^L4#mIc(fGt^TP36;~yJoR{nyx2vLoZ_3yVx2YNa2yx<HPY$a*es0#
zc6yqYGav`I6r8GafCAMf0Vk;HJ)bt(0Jn8Xf7pcgbyA1abm46y*ihCJJ8lW<a3^le
ziRTx85jz%x+@FY43lfgr*%~_*+7Xtnoh1SQx2|V)^gO9|3qeRz{L;yGJbHcyp_`vT
zcgc;$J-X`^9ej3}Osgw6nO3oOMHL@k|Jyt)8%azC5D#!manLrT<vrqjV<#wVac%N&
zY@*C4<^SR@CWlS(SNfU7r2D+=ruI?6Z?i}aU(aKI-}9*VrgskDm~xJ_34B>oQ!ToO
z`!4WjgK^F}6NIFG(T6i_@aNjzvt0xFTIgHO-XrVjC+EoATTpw~9Fnv_7D3fC=YW`5
VHrBlQo&vJvCtAM5M(LIDk&$i7Rn!0g

diff --git a/po-lint/po-linter.go b/po-lint/po-linter.go
deleted file mode 100644
index ee0399c..0000000
--- a/po-lint/po-linter.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/ghodss/yaml"
-	"github.com/ministryofjustice/cloud-platform-environments/pkg/authenticate"
-	"github.com/prometheus-operator/prometheus-operator/pkg/admission"
-	v1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
-	"github.com/prometheus/prometheus/model/rulefmt"
-	githubaction "github.com/sethvargo/go-githubactions"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func prDir(token, githubrepo, githubref string) ([]string, error) {
-	if token == "" {
-		return nil, errors.New("you must have a valid GitHub token")
-	}
-
-	client, err := authenticate.GitHubClient(token)
-	if err != nil {
-		return nil, err
-	}
-
-	//repo user and repo name
-	githubrepoS := strings.Split(githubrepo, "/")
-	owner := githubrepoS[0]
-	repo := githubrepoS[1]
-
-	// get pr owner
-	githubrefS := strings.Split(githubref, "/")
-	branch := githubrefS[2]
-	bid, _ := strconv.Atoi(branch)
-
-	repos, _, _ := client.PullRequests.ListFiles(context.Background(), owner, repo, bid, nil)
-
-	var fileDir []string
-	for _, repo := range repos {
-		if strings.Contains(*repo.Filename, "kubectl_deploy") {
-			fileDir = append(fileDir, *repo.Filename)
-		}
-	}
-	return fileDir, nil
-
-}
-
-func polint(dir []string) {
-	files := dir
-
-	for _, filename := range files {
-		log.SetPrefix(fmt.Sprintf("%s: ", filename))
-		content, err := ioutil.ReadFile(filename)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		var meta metav1.TypeMeta
-
-		err = yaml.Unmarshal(content, &meta)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		switch meta.Kind {
-		case v1.PrometheusRuleKind:
-			j, err := yaml.YAMLToJSON(content)
-			if err != nil {
-				log.Fatalf("unable to convert YAML to JSON: %v", err)
-			}
-
-			decoder := json.NewDecoder(bytes.NewBuffer(j))
-			decoder.DisallowUnknownFields()
-
-			var rule v1.PrometheusRule
-			err = decoder.Decode(&rule)
-			if err != nil {
-				log.Fatalf("prometheus rule is invalid: %v", err)
-			}
-			err = validateRules(content)
-			if err != nil {
-				o := fmt.Sprintf("prometheus rule validation failed: %v", err)
-				githubaction.SetOutput("po-linter", o)
-				log.Fatalf("prometheus rule validation failed: %v", err)
-			}
-		default:
-			log.Print("MetaType is unknown to linter. Not in PrometheusRule")
-		}
-	}
-}
-
-func validateRules(content []byte) error {
-	rule := &admission.PrometheusRules{}
-	err := yaml.Unmarshal(content, rule)
-	if err != nil {
-		return fmt.Errorf("unable load prometheus rule: %w", err)
-	}
-	rules, errorsArray := rulefmt.Parse(rule.Spec.Raw)
-	if len(errorsArray) != 0 {
-		for _, err := range errorsArray {
-			log.Println(err)
-		}
-		return errors.New("rules are not valid")
-	}
-	if len(rules.Groups) == 0 {
-		return errors.New("no group found")
-	}
-	for _, group := range rules.Groups {
-		if len(group.Rules) == 0 {
-			return fmt.Errorf("no rules found in group: %s: %w", group.Name, err)
-		}
-	}
-	return nil
-}
-
-var (
-	token      = flag.String("token", os.Getenv("GITHUB_OAUTH_TOKEN"), "GihHub Personel token string")
-	githubrepo = flag.String("githubrepo", os.Getenv("GITHUB_REPOSITORY"), "Github Repository string")
-	githubref  = flag.String("githubref", os.Getenv("GITHUB_REF"), "Github Respository PR ref string")
-)
-
-func main() {
-	d, err := prDir(*token, *githubrepo, *githubref)
-	if err != nil {
-		log.Fatal(err)
-	}
-	polint(d)
-
-}