Tech 4909 exception handling improvement

.github/workflows/build-and-deploy.yaml

@@ -14,7 +14,6 @@ jobs:
       AWS_REGION: us-east-1
       CLUSTER_NAME: maker-prod
       DOCKER_IMAGE_REGISTRY: makerdao/cage-keeper
-      DOCKER_IMAGE_TAG: latest
 
     steps:
     - name: Checkout
@@ -33,17 +32,21 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+    - name: Set short git commit SHA
+      id: vars
+      run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
     - name: Build, tag, and push image to Dockerhub
       id: build-image
       run: |
         docker build -t ${{ env.DOCKER_IMAGE_REGISTRY }} .
-        docker tag ${{ env.DOCKER_IMAGE_REGISTRY }} ${{ env.DOCKER_IMAGE_REGISTRY }}:${{ env.DOCKER_IMAGE_TAG }}
-        docker push ${{ env.DOCKER_IMAGE_REGISTRY }}:${{ env.DOCKER_IMAGE_TAG }}
+        docker tag ${{ env.DOCKER_IMAGE_REGISTRY }} ${{ env.DOCKER_IMAGE_REGISTRY }}:${{ steps.vars.outputs.sha_short }}
+        docker push ${{ env.DOCKER_IMAGE_REGISTRY }}:${{ steps.vars.outputs.sha_short }}
 
     - name: Deploying app to Kubernetes with Helm
       uses: bitovi/github-actions-deploy-eks-helm@v1.2.4
       with:
-        values: image.repository=${{ env.DOCKER_IMAGE_REGISTRY }},image.tag=${{ env.DOCKER_IMAGE_TAG }}
+        values: image.repository=${{ env.DOCKER_IMAGE_REGISTRY }},image.tag=${{ steps.vars.outputs.sha_short }}
         cluster-name: ${{ env.CLUSTER_NAME }}
         config-files: deploy/production/cage-keeper.yaml
         chart-path: techops-services/common

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/makerdao/pymaker.git
 [submodule "lib/auction-keeper"]
 	path = lib/auction-keeper
-	url = https://github.com/makerdao/auction-keeper.git
+	url = https://github.com/chong-techops/auction-keeper.git
 [submodule "lib/pygasprice-client"]
 	path = lib/pygasprice-client
-	url = https://github.com/makerdao/pygasprice-client.git
+	url = https://github.com/chong-techops/pygasprice-client.git

src/cage_keeper.py

@@ -88,9 +88,11 @@ def __init__(self, args: list, **kwargs):
                             help="Enable debug output")
 
         parser.add_argument("--etherscan-api-key", type=str, default=None, help="Etherscan API key for gas price oracle")
-        parser.add_argument("--gas-initial-multiplier", type=str, default=1.0, help="Gas price multiplier for first try")
-        parser.add_argument("--gas-reactive-multiplier", type=str, default=2.25, help="Gas price multiplier for subsequent tries")
-        parser.add_argument("--gas-maximum", type=str, default=5000, help="Maximum gas price in Gwei")
+        parser.add_argument("--oracle-gas-price", dest='oracle_gas_price', action='store_true', default=True,
+                            help="Use gas price oracle for gas price discovery (default: True)")
+        parser.add_argument("--gas-initial-multiplier", type=float, default=1.0, help="Gas price multiplier for first try")
+        parser.add_argument("--gas-reactive-multiplier", type=float, default=2.25, help="Gas price multiplier for subsequent tries")
+        parser.add_argument("--gas-maximum", type=float, default=5000, help="Maximum gas price in Gwei")
 
         parser.set_defaults(cageFacilitated=False)
         self.arguments = parser.parse_args(args)
@@ -117,9 +119,22 @@ def __init__(self, args: list, **kwargs):
         self.confirmations = 0
 
         # Create gas strategy
+        # Set default values for missing arguments to avoid AttributeError
+        if not hasattr(self.arguments, 'ethgasstation_api_key'):
+            self.arguments.ethgasstation_api_key = None
+        if not hasattr(self.arguments, 'poanetwork_url'):
+            self.arguments.poanetwork_url = None
+        if not hasattr(self.arguments, 'blocknative_api_key'):
+            self.arguments.blocknative_api_key = None
+        if not hasattr(self.arguments, 'fixed_gas_price'):
+            self.arguments.fixed_gas_price = None
+
         if self.arguments.etherscan_api_key:
+            # Use Etherscan for gas price
             self.gas_price = DynamicGasPrice(self.arguments, self.web3)
         else:
+            # If no Etherscan API key is provided, set oracle_gas_price to False to avoid the error
+            self.arguments.oracle_gas_price = False
             self.gas_price = DefaultGasPrice()