Merge pull request #144 from IBM/update_failing_build_logic

Update makefile to remove Artifactory references

Makefile.ibm

@@ -10,14 +10,14 @@ DOCKER_REGISTRY_ICR := icr.io
 DOCKER_USER_ICR := iamapikey
 DOCKER_PASS_ICR := $(IBM_CLOUD_API_KEY)
 
-DOCKER_REGISTRY_ART := txo-toolbox-team-docker-local.artifactory.swg-devops.com
-DOCKER_USER_ART := $(ART_USER_ID)
-DOCKER_PASS_ART := $(ART_API_KEY)
+# DOCKER_REGISTRY_ART := txo-toolbox-team-docker-local.artifactory.swg-devops.com
+# DOCKER_USER_ART := $(ART_USER_ID)
+# DOCKER_PASS_ART := $(ART_API_KEY)
 
 DOCKER_IMAGES_TO_TAG := detect-secrets detect-secrets-hook
 DOCKER_IMAGES_TO_SCAN := detect-secrets detect-secrets-hook detect-secrets:redhat-ubi detect-secrets:redhat-ubi-custom
 DOCKER_IMAGES_TO_PUBLISH :=
-DOCKER_REGISTRIES := $(DOCKER_REGISTRY_ICR) $(DOCKER_REGISTRY_ART)
+DOCKER_REGISTRIES := $(DOCKER_REGISTRY_ICR)
 
 IMAGE_NAME :=
 DOCKER_REGISTRY :=
@@ -87,7 +87,7 @@ docker-build-images:
 	done
 
 docker-login:
-	@echo $(DOCKER_PASS_ART) | docker login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART);
+	# @echo $(DOCKER_PASS_ART) | docker login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART);
 	@echo $(DOCKER_PASS_ICR) | docker login -u $(DOCKER_USER_ICR) --password-stdin $(DOCKER_REGISTRY_ICR);
 
 docker-publish-images: docker-login
@@ -123,7 +123,7 @@ docker-publish-image:
 	$(COSIGN) verify --key env://COSIGN_PUBLIC_KEY "$(DOCKER_REGISTRY)/$(DOCKER_DOMAIN)/$(IMAGE_NAME)";
 
 cosign-login:
-	@echo $(DOCKER_PASS_ART) | $(COSIGN) login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART); \
+	# @echo $(DOCKER_PASS_ART) | $(COSIGN) login -u $(DOCKER_USER_ART) --password-stdin $(DOCKER_REGISTRY_ART); \
 	@echo $(DOCKER_PASS_ICR) | $(COSIGN) login -u $(DOCKER_USER_ICR) --password-stdin $(DOCKER_REGISTRY_ICR);
 
 publish-cos:

tests/core/baseline_test.py

@@ -22,7 +22,7 @@
 
 class TestInitializeBaseline:
 
-    def setup(self):
+    def setup_method(self):
         self.plugins = (
             Base64HighEntropyString(4.5),
             HexHighEntropyString(3),

tests/core/secrets_collection_test.py

@@ -269,7 +269,7 @@ class TestBaselineInputOutput:
     related to that ability.
     """
 
-    def setup(self):
+    def setup_method(self):
         self.logic = secrets_collection_factory(
             secrets=[
                 {

tests/plugins/aws_key_test.py

@@ -16,7 +16,7 @@
 
 class TestAWSKeyDetector(object):
 
-    def setup(self):
+    def setup_method(self):
         self.example_key = 'AKIAZZZZZZZZZZZZZZZZ'
 
     @pytest.mark.parametrize(

tests/plugins/common/initialize_test.py

@@ -40,7 +40,7 @@ def test_fails_on_bad_initialization(self):
 
 class TestFromSecretType:
 
-    def setup(self):
+    def setup_method(self):
         self.settings = [
             {
                 'name': 'Base64HighEntropyString',

tests/plugins/high_entropy_strings_test.py

@@ -140,7 +140,7 @@ def test_entropy_upper_limit(self):
 
 class TestRegularBase64HighEntropyStrings(HighEntropyStringsTest):
 
-    def setup(self):
+    def setup_method(self):
         super(TestRegularBase64HighEntropyStrings, self).setup(
             # Testing default limit, as suggested by truffleHog.
             logic=Base64HighEntropyString(
@@ -238,7 +238,7 @@ def test_env_file(self):
 
 
 class TestUrlSafeBase64HighEntropyStrings(HighEntropyStringsTest):
-    def setup(self):
+    def setup_method(self):
         super(TestUrlSafeBase64HighEntropyStrings, self).setup(
             # Testing default limit, as suggested by truffleHog.
             logic=Base64HighEntropyString(
@@ -267,7 +267,7 @@ def calculate_shannon_entropy(self, data):
 
 class TestHexHighEntropyStrings(HighEntropyStringsTest):
 
-    def setup(self):
+    def setup_method(self):
         super(TestHexHighEntropyStrings, self).setup(
             # Testing default limit, as suggested by truffleHog.
             logic=HexHighEntropyString(