Add more changes

Signed-off-by: Divya Madala <divyaasm@amazon.com>

Author: Divyaasm

src/validation_workflow/docker/validation_docker.py

@@ -58,7 +58,6 @@ def validation(self) -> bool:
         # STEP 2 . inspect image digest between opensearchproject(downloaded/local) and opensearchstaging(dockerHub)
         if not self.args.using_staging_artifact_only:
             self.image_names_list = ['opensearchproject/' + project for project in self.args.projects]
-            self.image_names_list = [x for x in self.image_names_list if (os.path.basename(x) in self.args.projects)]
             self.image_digests = list(map(lambda x: self.inspect_docker_image(x[0], x[1]), zip(self.image_ids.values(), self.image_names_list)))  # type: ignore
             if all(self.image_digests):
                 logging.info('Image digest is validated.\n\n')

tests/tests_validation_workflow/test_validation.py

@@ -79,7 +79,6 @@ def test_check_for_security_plugin(self, mock_validation_args: Mock, mock_path_e
     @patch('validation_workflow.validation.Validation.check_http_request')
     @patch('validation_workflow.validation.ValidationArgs')
     def test_check_cluster_readiness_error(self, mock_validation_args: Mock, mock_check_http: Mock, mock_sleep: Mock) -> None:
-        mock_validation_args.return_value.OS_image = 'opensearchstaging/opensearch-os'
         mock_validation_args.return_value.version = '1.0.0.1000'
         mock_validation_args.return_value.validate_digest_only = False
         mock_validation_args.return_value.force_https = False

tests/tests_validation_workflow/test_validation_docker.py

@@ -47,7 +47,6 @@ def test_download_artifacts(self, mock_is_container_daemon_running: Mock, mock_v
     @patch('validation_workflow.docker.validation_docker.InspectDockerImage.inspect_digest')
     def test_staging(self, mock_digest: Mock, mock_container: Mock, mock_test: Mock, mock_docker_image: Mock, mock_validation_args: Mock, mock_check_http: Mock) -> None:
         # Set up mock objects
-        mock_validation_args.return_value.OS_image = 'opensearchstaging/opensearch-os'
         mock_validation_args.return_value.version = '1.0.0.1000'
         mock_validation_args.return_value.validate_digest_only = False
         mock_validation_args.return_value.force_https = False
@@ -78,7 +77,6 @@ def test_staging(self, mock_digest: Mock, mock_container: Mock, mock_test: Mock,
     @patch('validation_workflow.docker.validation_docker.ValidateDocker.run_container')
     def test_staging_cluster_not_ready(self, mock_container: Mock, mock_validation_args: Mock,
                                        mock_cluster_readiness: Mock) -> None:
-        mock_validation_args.return_value.OS_image = 'opensearchstaging/opensearch-os'
         mock_validation_args.return_value.version = '1.0.0.1000'
         mock_validation_args.return_value.validate_digest_only = False
         mock_validation_args.return_value.force_https = False
@@ -98,7 +96,6 @@ def test_staging_cluster_not_ready(self, mock_container: Mock, mock_validation_a
     @patch('validation_workflow.docker.validation_docker.ValidationArgs')
     @patch('validation_workflow.docker.validation_docker.ValidateDocker.run_container')
     def test_container_startup_exception(self, mock_container: Mock, mock_validation_args: Mock) -> None:
-        mock_validation_args.return_value.OS_image = 'opensearchstaging/opensearch-os'
         mock_validation_args.return_value.version = '1.0.0.1000'
         mock_validation_args.return_value.validate_digest_only = False
         mock_validation_args.return_value.force_https = False
@@ -123,7 +120,6 @@ def test_container_startup_exception(self, mock_container: Mock, mock_validation
     @patch('validation_workflow.docker.validation_docker.InspectDockerImage.inspect_digest')
     def test_digests(self, mock_digest: Mock, mock_container: Mock, mock_test: Mock, mock_docker_image: Mock, mock_validation_args: Mock, mock_check_http: Mock) -> None:
         # Set up mock objects
-        mock_validation_args.return_value.OS_image = 'opensearchstaging/opensearch-os'
         mock_validation_args.return_value.version = '1.0.0.1000'
         mock_validation_args.return_value.using_staging_artifact_only = False
         mock_validation_args.return_value.validate_digest_only = True