Add changes to docker

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

Author: Divyaasm

src/validation_workflow/docker/inspect_docker_image.py

@@ -27,7 +27,7 @@ def __init__(self, image_id: str, image_name: str, prod_image_tag: str) -> None:
         self.image_id = image_id
         self.image_name = image_name
         self.prod_image_tag = prod_image_tag
-        self.image_tag = ValidationArgs().stg_tag('opensearch_dashboards').replace(" ", "") if ("dashboards" in self.image_name) else ValidationArgs().stg_tag('opensearch').replace(" ", "")
+        self.image_tag = ValidationArgs().stg_tag('opensearch-dashboards').replace(" ", "") if ("dashboards" in self.image_name) else ValidationArgs().stg_tag('opensearch').replace(" ", "")
         self.auth_token_url = "https://auth.docker.io/token?"
         self.auth_service_scope = "service=registry.docker.io&scope=repository:"
         self.registry_url = "https://index.docker.io/v2/"

src/validation_workflow/docker/validation_docker.py

@@ -15,6 +15,7 @@
 
 import requests
 
+from test_workflow.integ_test.utils import get_password
 from validation_workflow.api_request import ApiTest
 from validation_workflow.api_test_cases import ApiTestCases
 from validation_workflow.docker.inspect_docker_image import InspectDockerImage
@@ -60,7 +61,7 @@ def start_cluster(self) -> bool:
     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 = [self.args.OS_image, self.args.OSD_image]
+            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):
@@ -93,8 +94,8 @@ def validation(self) -> bool:
                         raise Exception(f'Not all tests Pass : {_counter}')
                 else:
                     raise Exception("Cluster is not ready for API test.")
-        else:
-            raise Exception('The container failed to start. Exiting the validation.')
+            else:
+                raise Exception('The container failed to start. Exiting the validation.')
 
         return True
 
@@ -130,10 +131,10 @@ def cleanup_process(self) -> bool:
 
     def check_http_request(self) -> bool:
         self.test_readiness_urls = {
-            'https://localhost:9200/': 'opensearch cluster API',
-            'http://localhost:5601/api/status': 'opensearch-dashboards API',
+            'https://localhost:9200': 'opensearch cluster API'
         }
-
+        if 'opensearch-dashboards' in self.args.projects:
+            self.test_readiness_urls['http://localhost:5601/api/status'] = 'opensearch-dashboards API'
         for url, name in self.test_readiness_urls.items():
             try:
                 status_code, response_text = ApiTest(url, self.args.version).api_get()
@@ -200,8 +201,7 @@ def inplace_change(self, filename: str, old_string: str, new_string: str) -> Non
         with open(filename) as f:
             s = f.read()
             if old_string not in s:
-                logging.info
-                ('"{old_string}" not found in {filename}.'.format(**locals()))
+                logging.info('"{old_string}" not found in {filename}.'.format(**locals()))
                 return
         with open(filename, 'w') as f:
             logging.info('Changing "{old_string}" to "{new_string}" in {filename}'.format(**locals()))
@@ -250,8 +250,9 @@ def run_container(self, image_ids: dict, version: str) -> Any:
         self.replacements = [(f'opensearchproject/{key}:{self.major_version_number}', value) for key, value in image_ids.items()]
 
         list(map(lambda r: self.inplace_change(self.target_yml_file, r[0], r[1]), self.replacements))
-
+        os.environ["OPENSEARCH_INITIAL_ADMIN_PASSWORD"] = get_password(str(version))
         # spin up containers
-        self.docker_compose_up = f'docker-compose -f {self.target_yml_file} up -d'
+        services = "opensearch-node1 opensearch-node2" if "opensearch-dashboards" not in self.args.projects else ""
+        self.docker_compose_up = f'docker-compose -f {self.target_yml_file} up -d {services}'
         result = subprocess.run(self.docker_compose_up, shell=True, stdout=PIPE, stderr=PIPE, universal_newlines=True)
         return ('returncode=0' in (str(result)), self.target_yml_file)

src/validation_workflow/validation_args.py

@@ -123,12 +123,14 @@ def __init__(self) -> None:
             "--validate-digest-only",
             action="store_true",
             default=False,
-            help="(optional) Validate digest only; will not run docker to test API")
+            help="(optional) Validate digest only; will not run docker to test API",
+            dest="validate_digest_only")
         group.add_argument(
             "--using-staging-artifact-only",
             action="store_true",
             default=False,
-            help="(optional) Use only staging artifact to run docker and API test, will not validate digest")
+            help="(optional) Use only staging artifact to run docker and API test, will not validate digest",
+            dest="using_staging_artifact_only")
 
         args = parser.parse_args()
 
@@ -140,6 +142,12 @@ def __init__(self) -> None:
             args.distribution = self.get_distribution_type(args.file_path)
             args.projects = args.file_path.keys()
 
+        if args.distribution == "docker":
+            if args.osd_build_number != "latest" and "opensearch-dashboards" not in args.projects:
+                raise Exception("Provide opensearch-dashboards in projects argument to validate OSD")
+            if not(args.validate_digest_only or args.using_staging_artifact_only):
+                raise Exception("Provide either of --validate-digest-only and --using-staging-artifact-only for Docker Validation")
+
         self.version = args.version
         self.file_path = args.file_path
         self.artifact_type = args.artifact_type
@@ -149,8 +157,6 @@ def __init__(self) -> None:
         self.platform = args.platform
         self.projects = args.projects
         self.arch = args.arch
-        self.OS_image = 'opensearchproject/opensearch'
-        self.OSD_image = 'opensearchproject/opensearch-dashboards'
         self.build_number = {"opensearch": args.os_build_number, "opensearch-dashboards": args.osd_build_number}
         self.os_build_number = args.os_build_number
         self.osd_build_number = args.osd_build_number
@@ -178,8 +184,8 @@ def stg_tag(self, image_type: str) -> str:
                 None,
                 [
                     self.version,
-                    "." + self.os_build_number if (self.os_build_number != "") and (image_type == "opensearch") else None,
-                    "." + self.osd_build_number if (self.osd_build_number != "") and (image_type == "opensearch_dashboards") else None,
+                    "." + self.os_build_number if (self.os_build_number != "latest") and (image_type == "opensearch") else None,
+                    "." + self.osd_build_number if (self.osd_build_number != "latest") and (image_type == "opensearch-dashboards") else None,
                 ],
             )
         )

tests/tests_validation_workflow/test_inspect_docker_image.py

@@ -23,13 +23,14 @@ def setUp(self) -> None:
         self.prod_image_tag = "1.2.3"
         self.os_build_number = "1000"
         self.osd_build_number = "2000"
+        self.projects = ["opensearch", "opensearch-dashboards"]
         self.version = "2.4.0"
         with patch("validation_workflow.docker.inspect_docker_image.ValidationArgs", MagicMock()) as mock_args:
             mock_args.stg_tag.return_value = "stg_tag"
             self.inspector = InspectDockerImage(self.image_id, self.image_name, self.prod_image_tag)
 
     def test_validation_args_stg_arg(self) -> None:
-        result = ValidationArgs.stg_tag(self, 'opensearch_dashboards').replace(" ", "")  # type: ignore
+        result = ValidationArgs.stg_tag(self, 'opensearch-dashboards').replace(" ", "")  # type: ignore
         self.assertEqual(result, "2.4.0.2000")
         result = ValidationArgs.stg_tag(self, 'opensearch').replace(" ", "")  # type: ignore
         self.assertEqual(result, "2.4.0.1000")

tests/tests_validation_workflow/test_validation_args.py

@@ -34,7 +34,7 @@ def test_without_arguments(self) -> None:
     def test_rpm_distribution(self) -> None:
         self.assertEqual(ValidationArgs().distribution, "rpm")
 
-    @patch("argparse._sys.argv", [VALIDATION_PY, "--version", "2.4.0", "--distribution", "docker"])
+    @patch("argparse._sys.argv", [VALIDATION_PY, "--version", "2.4.0", "--distribution", "docker", "--projects", "opensearch", "--using-staging-artifact-only"])
     def test_docker_distribution(self) -> None:
         self.assertEqual(ValidationArgs().distribution, "docker")
         self.assertNotEqual(ValidationArgs().distribution, "yum")