Support verbosity in creating Cloud SQL instances.

Also fix tests not to send "config" to "init" action of resources.

Author: Arik Kfir

resources/src/dresources.py

@@ -151,6 +151,10 @@ def verbose(self) -> bool:
     def workspace(self) -> Path:
         return Path(self._data['workspace'])
 
+    @property
+    def has_config(self)->bool:
+        return 'config' in self._data
+
     @property
     def config(self) -> Mapping[str, Any]:
         """The resource configuration, which in essence is the *desired* state of the resource, as depicted by the user

resources/src/gcp_cloud_sql.py

@@ -525,10 +525,12 @@ def __init__(self, data: dict, svc: ExternalServices = ExternalServices()) -> No
             }
         })
 
-        cfg: dict = self.info.config
-        if "maintenance" in cfg and cfg["maintenance"] is not None:
-            if 'day' in cfg["maintenance"] and type(cfg["maintenance"]['day']) == str:
-                cfg["maintenance"]['day'] = _translate_day_name_to_number(cfg["maintenance"]['day'])
+        # translate maintenance window name to number
+        if self.info.has_config:
+            cfg: dict = self.info.config
+            if "maintenance" in cfg and cfg["maintenance"] is not None:
+                if 'day' in cfg["maintenance"] and type(cfg["maintenance"]['day']) == str:
+                    cfg["maintenance"]['day'] = _translate_day_name_to_number(cfg["maintenance"]['day'])
 
     def discover_state(self):
         cfg: dict = self.info.config
@@ -861,9 +863,13 @@ def create_sql_instance(self, args) -> None:
 
         # create instance
         project_id: str = cfg['project_id']
+        if self.info.verbose:
+            print(f"Creating Cloud SQL instance using:\n{json.dumps(body, indent=2)}")
         self.svc.create_gcp_sql_instance(project_id=project_id, body=body)
 
         # set 'root' password
+        if self.info.verbose:
+            print(f"Updating root user's password")
         self.svc.update_gcp_sql_user(project_id=project_id, instance=cfg['name'], password=cfg['root-password'])
 
         # check for scripts that need to be executed

tests/test_resources.py

@@ -50,16 +50,20 @@ def find_scenarios(scenario_pattern: str) -> Sequence[Tuple[str, dict, dict, dic
     return scenarios
 
 
-def create_resource(svc: MockExternalServices, resource: dict, extra_data: dict = None) -> DResource:
+def create_resource(svc: MockExternalServices,
+                    resource: dict,
+                    include_config: bool = False,
+                    extra_data: dict = None) -> DResource:
     """Creates a resource instance (subclass of DResource)."""
     module = importlib.import_module(resource["module"])
     resource_type: Callable[[dict, ExternalServices], DResource] = getattr(module, resource["class"])
     data = {"name": resource["name"] if 'name' in resource else 'test',
             "type": resource["class"],
             "version": resource["version"] if "version" in resource else "0.0.0",
             "verbose": resource["verbose"] if 'verbose' in resource else True,
-            "workspace": "/workspace",
-            "config": resource["config"]}
+            "workspace": "/workspace"}
+    if include_config:
+        data.update({"config": resource["config"]})
     if extra_data is not None:
         data.update(extra_data)
     return resource_type(data, svc)
@@ -102,9 +106,9 @@ def test_resources(capsys, description: str, mock: dict, resource: dict, expecte
     # test "state" action, and read its result from stdout
     if 'exception' in expected:
         with pytest.raises(eval(expected['exception']), match=expected["match"] if 'match' in expected else r'.*'):
-            create_resource(svc=mock_services, resource=resource).execute(['state'])
+            create_resource(svc=mock_services, resource=resource, include_config=True).execute(['state'])
     else:
-        create_resource(svc=mock_services, resource=resource).execute(['state'])
+        create_resource(svc=mock_services, resource=resource, include_config=True).execute(['state'])
         state = json.loads(capsys.readouterr().out)
         assert state == expected
 
@@ -113,4 +117,7 @@ def test_resources(capsys, description: str, mock: dict, resource: dict, expecte
             for action in state["actions"]:
                 extra_data: dict = {'staleState': state['staleState'] if 'staleState' in state else {}}
                 args = action['args'] if 'args' in action else []
-                create_resource(svc=mock_services, resource=resource, extra_data=extra_data).execute(args)
+                create_resource(svc=mock_services,
+                                resource=resource,
+                                include_config=True,
+                                extra_data=extra_data).execute(args)