From 1944e467864e5fefc0760c8bcf177bd4c73c22cc Mon Sep 17 00:00:00 2001
From: Nicko Guyer <nicko.guyer@kaleido.io>
Date: Thu, 11 Apr 2024 13:40:04 -0400
Subject: [PATCH] Make the linter happy

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>
---
 Makefile                              |  1 +
 charts/firefly-evmconnect/values.yaml |  2 +-
 charts/firefly/values.yaml            |  8 +++++++-
 hack/enforce-chart-conventions.sh     | 21 ++++++++++++---------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e0e14b6..b7062bf 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ lint:
 	ct lint \
 		--target-branch=main \
 		--exclude-deprecated \
+		--excluded-charts besu-node,besu-genesis\
 		--check-version-increment=false \
 		--lint-conf=./charts/lintconf.yaml
 	./hack/enforce-chart-conventions.sh
diff --git a/charts/firefly-evmconnect/values.yaml b/charts/firefly-evmconnect/values.yaml
index 7ec3edf..6c562b7 100644
--- a/charts/firefly-evmconnect/values.yaml
+++ b/charts/firefly-evmconnect/values.yaml
@@ -62,7 +62,7 @@ config:
   connector: |
     url: {{ .Values.config.jsonRpcUrl | quote }}
 
-  policyEngine: {}
+  policyEngine: ""
 
   policyLoop: {}
 
diff --git a/charts/firefly/values.yaml b/charts/firefly/values.yaml
index 4a9134e..56c62ea 100644
--- a/charts/firefly/values.yaml
+++ b/charts/firefly/values.yaml
@@ -59,6 +59,12 @@ config:
   # The URL + URI Go template of an address resolver connector
   addresssResolverUrlTemplate: ""
 
+  # The Ethereum address of the _original_, pre-deployed FireFly smart contract
+  fireflyContractAddress: "contractAddress"
+
+  # The block number of when the first event of the FireFly smart contract occurs
+  fireflyContractFirstEvent: 0
+
   # The Ethereum address(es) or Fabric chaincode(s) of the additional FireFly smart contract instances
   fireflyContracts: []
   # for ethereum
@@ -409,7 +415,7 @@ erc1155:
   enabled: false
 
   # The address of the deployed ERC1155 contract to use
-  contractAddress:
+  contractAddress: "/contracts/erc1155Address"
 
   # The Ethconnect URI representing the ERC1155 tokens contract
   ethconnectInstance: "/contracts/erc1155"
diff --git a/hack/enforce-chart-conventions.sh b/hack/enforce-chart-conventions.sh
index e02cb43..2aebd5e 100755
--- a/hack/enforce-chart-conventions.sh
+++ b/hack/enforce-chart-conventions.sh
@@ -3,15 +3,18 @@
 failed=0
 for yamlTemplate in $(find ./charts -regex '^\.\/charts\/.*\/templates\/[^\/]*.*\/*.*\.yaml'); do
   kind=$(cat $yamlTemplate | grep -e '^kind:' | awk '{ printf("%s\n", $2) }' |  tr '[:upper:]' '[:lower:]')
-  if ! basename "$yamlTemplate" | grep -E "^${kind}[s]?\-?[a-z\-]*\.yaml$" > /dev/null; then
-    echo "ERROR: $yamlTemplate filename does not start with $kind"
-    failed=$(($failed+1))
-  fi
-
-  if ! cat $yamlTemplate | grep "$(cat ./charts/license.tpl)"  > /dev/null; then
-    echo "ERROR: $yamlTemplate filename does not start with the license"
-    failed=$(($failed+1))
-  fi
+  
+  case "$yamlTemplate" in 
+  *"./charts/besu-"*)
+      # Ingore the besu charts as they were just copied over from their repo
+    ;;
+    *)
+      if ! cat $yamlTemplate | grep "$(cat ./charts/license.tpl)"  > /dev/null; then
+        echo "ERROR: $yamlTemplate filename does not start with the license"
+        failed=$(($failed+1))
+      fi
+    ;;
+  esac
 done
 
 if [[ $failed -gt 0 ]]; then