Merged main and removed conflicts

canonical · Jul 3, 2023 · 7723598 · 7723598
2 parents 475cc83 + b8373d8
commit 7723598
Show file tree

Hide file tree

Showing 24 changed files with 80 additions and 135 deletions.
diff --git a/.air.toml b/.air.toml
@@ -29,6 +29,7 @@ tmp_dir = "tmp"
 
 [log]
   time = false
+  main_only = true
 
 [misc]
   clean_on_exit = false

diff --git a/charms/jimm-k8s/src/charm.py b/charms/jimm-k8s/src/charm.py
@@ -318,7 +318,7 @@ def _update_workload(self, event):
         if dashboard_relation and self.unit.is_leader():
             dashboard_relation.data[self.app].update(
                 {
-                    "controller-url": dns_name,
+                    "controller-url": "wss://{}".format(dns_name),
                     "identity-provider-url": self.config.get("candid-url"),
                     "is-juju": str(False),
                 }
@@ -347,7 +347,7 @@ def _on_dashboard_relation_joined(self, event: RelationJoinedEvent):
 
         event.relation.data[self.app].update(
             {
-                "controller-url": dns_name,
+                "controller-url": "wss://{}".format(dns_name),
                 "identity-provider-url": self.config["candid-url"],
                 "is-juju": str(False),
             }

diff --git a/charms/jimm-k8s/tests/unit/test_charm.py b/charms/jimm-k8s/tests/unit/test_charm.py
@@ -269,7 +269,7 @@ def test_dashboard_relation_joined(self):
         self.assertTrue(data)
         self.assertEqual(
             data["controller-url"],
-            "juju-jimm-k8s-0.juju-jimm-k8s-endpoints.None.svc.cluster.local",
+            "wss://juju-jimm-k8s-0.juju-jimm-k8s-endpoints.None.svc.cluster.local",
         )
         self.assertEqual(data["identity-provider-url"], "https://candid.example.com")
         self.assertEqual(data["is-juju"], "False")

diff --git a/charms/jimm/README.md b/charms/jimm/README.md
@@ -43,6 +43,7 @@ juju deploy openfga
 juju add-relation juju-jimm:openfga postgresql:openfga
 ```
 
+
 ## Developing
 
 Create and activate a virtualenv with the development requirements:

diff --git a/charms/jimm/charmcraft.yaml b/charms/jimm/charmcraft.yaml
@@ -4,16 +4,19 @@ type: "charm"
 parts:
   charm:
     prime:
-    - ./templates
-    - ./files
-    - README.md
+      - ./templates
+      - ./files
+      - README.md
     charm-python-packages: [setuptools]
+    charm-binary-python-packages:
+      - pydantic
+      - cosl
 bases:
   # Ensure run-on is the same or newer than build-on
   # since jimm-server is a Go binary using CGO dependencies
   - build-on:
-    - name: "ubuntu"
-      channel: "20.04"
+      - name: "ubuntu"
+        channel: "20.04"
     run-on:
-    - name: "ubuntu"
-      channel: "20.04"
+      - name: "ubuntu"
+        channel: "20.04"
diff --git a/charms/jimm/metadata.yaml b/charms/jimm/metadata.yaml
@@ -22,7 +22,7 @@ issues: https://github.com/canonical/jimm/issues
 
 description: |
   JIMM is a juju controller, used in conjunction with the JaaS dashboard to provide a seamless way
-  to manage models, regardless of where their controllers reside or what cloud they may be running on. 
+  to manage models, regardless of where their controllers reside or what cloud they may be running on.
 
 provides:
   website:

diff --git a/charms/jimm/requirements.txt b/charms/jimm/requirements.txt
@@ -3,5 +3,5 @@ Jinja2 >= 2.11.3
 ops >= 2.0.0
 charmhelpers >= 0.20.22
 hvac >= 0.11.0
-pydantic
+pydantic == 1.10.10
 cosl
diff --git a/charms/jimm/src/charm.py b/charms/jimm/src/charm.py
@@ -142,7 +142,6 @@ def _on_config_changed(self, _):
 
         with open(self._env_filename(), "wt") as f:
             f.write(self._render_template("jimm.env", **args))
-
         if self._ready():
             self.restart()
         self._on_update_status(None)
@@ -151,7 +150,7 @@ def _on_config_changed(self, _):
         if dashboard_relation:
             dashboard_relation.data[self.app].update(
                 {
-                    "controller-url": self.config["dns-name"],
+                    "controller-url": "wss://{}".format(self.config["dns-name"]),
                     "identity-provider-url": self.config["candid-url"],
                     "is-juju": str(False),
                 }
@@ -399,7 +398,7 @@ def _snap(self, *args):
     def _on_dashboard_relation_joined(self, event):
         event.relation.data[self.app].update(
             {
-                "controller-url": self.config["dns-name"],
+                "controller-url": "wss://{}".format(self.config["dns-name"]),
                 "identity-provider-url": self.config["candid-url"],
                 "is-juju": str(False),
             }

diff --git a/charms/jimm/tests/test_charm.py b/charms/jimm/tests/test_charm.py
@@ -510,7 +510,7 @@ def test_dashboard_relation_joined(self):
             harness.charm._agent_filename = tmp.name
             harness.update_config(
                 {
-                    "dns-name": "https://jimm.example.com",
+                    "dns-name": "jimm.example.com",
                     "candid-agent-username": "username@candid",
                     "candid-agent-private-key": "agent-private-key",
                     "candid-agent-public-key": "agent-public-key",
@@ -526,7 +526,7 @@ def test_dashboard_relation_joined(self):
         harness.add_relation_unit(id, "juju-dashboard/0")
         data = harness.get_relation_data(id, "juju-jimm")
         self.assertTrue(data)
-        self.assertEqual(data["controller-url"], "https://jimm.example.com")
+        self.assertEqual(data["controller-url"], "wss://jimm.example.com")
         self.assertEqual(data["identity-provider-url"], "https://candid.example.com")
         self.assertEqual(data["is-juju"], "False")
 

diff --git a/charms/jimm/tox.ini b/charms/jimm/tox.ini
@@ -9,7 +9,6 @@ envlist = lint, unit
 [vars]
 src_path = {toxinidir}/src/
 tst_path = {toxinidir}/tests/
-;lib_path = {toxinidir}/lib/charms/operator_name_with_underscores
 all_path = {[vars]src_path} {[vars]tst_path} 
 
 [testenv]

diff --git a/cmd/jimmctl/cmd/modelstatus.go b/cmd/jimmctl/cmd/modelstatus.go
@@ -63,7 +63,7 @@ func (c *modelStatusCommand) SetFlags(f *gnuflag.FlagSet) {
 
 // Init implements the cmd.Command interface.
 func (c *modelStatusCommand) Init(args []string) error {
-	if len(args) < 0 {
+	if len(args) < 1 {
 		return errors.E("missing model uuid")
 	}
 	c.modelUUID, args = args[0], args[1:]

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -33,6 +33,7 @@ services:
     ports:
       - 17070:80
     environment:
+      JIMM_LOG_LEVEL: "debug"
       JIMM_UUID: "3217dbc9-8ea9-4381-9e97-01eab0b3f6bb"
       JIMM_DSN: "postgresql://jimm:jimm@db/jimm"
       CANDID_URL: "http://0.0.0.0:8081" # For external client redirects (in the case of compose and running outside)
@@ -78,9 +79,9 @@ services:
         condition: service_healthy
     labels:
       traefik.enable: true
-      traefik.http.routers.httpd.rule: Host(`jimm.localhost`)
-      traefik.http.routers.httpd.entrypoints: websecure
-      traefik.http.routers.httpd.tls: true
+      traefik.http.routers.jimm.rule: Host(`jimm.localhost`)
+      traefik.http.routers.jimm.entrypoints: websecure
+      traefik.http.routers.jimm.tls: true
 
   db:
     image: postgres
@@ -134,8 +135,6 @@ services:
     image: candid:latest
     container_name: candid
     entrypoint: "/candid.sh"
-    command: ""
-    # command: "/etc/candid/config.yaml && echo 'hi' && ls"
     expose:
       - 8081
     ports:

diff --git a/internal/dashboard/dashboard.go b/internal/dashboard/dashboard.go
@@ -118,7 +118,6 @@ func Handler(ctx context.Context, loc string) http.Handler {
 				)
 				continue
 			}
-
 			type guiArchiveVersion struct {
 				// Version holds the Juju GUI version number.
 				Version version.Number `json:"version"`

diff --git a/internal/dashboard/dashboard_test.go b/internal/dashboard/dashboard_test.go
@@ -183,7 +183,6 @@ func TestGUIArchiveEndpoint(t *testing.T) {
 	c.Check(resp.StatusCode, qt.Equals, http.StatusOK)
 	buf, err := io.ReadAll(resp.Body)
 	c.Assert(err, qt.IsNil)
-
 	c.Check(
 		string(buf),
 		qt.Equals,

diff --git a/internal/jimm/model_test.go b/internal/jimm/model_test.go
@@ -823,7 +823,7 @@ users:
 		CloudRegion:        "test-region-1",
 		CloudCredentialTag: names.NewCloudCredentialTag("test-cloud/alice@external/test-credential-1").String(),
 	},
-	expectError: "failed to update cloud credential: a silly error",
+	expectError: "failed to update cloud credential",
 }}
 
 func TestAddModel(t *testing.T) {

diff --git a/internal/jujuapi/applicationoffers.go b/internal/jujuapi/applicationoffers.go
@@ -60,7 +60,7 @@ func init() {
 		r.AddMethod("ApplicationOffers", 4, "FindApplicationOffers", findOffersMethod)
 		r.AddMethod("ApplicationOffers", 4, "ApplicationOffers", applicationOffersMethod)
 
-		return []int{1, 2, 3}
+		return []int{1, 2, 3, 4}
 	}
 }
 

diff --git a/internal/jujuapi/jimm.go b/internal/jujuapi/jimm.go
@@ -63,6 +63,7 @@ func init() {
 		r.AddMethod("JIMM", 3, "UpdateMigratedModel", updateMigratedModelMethod)
 		r.AddMethod("JIMM", 3, "AddCloudToController", addCloudToControllerMethod)
 		r.AddMethod("JIMM", 3, "RemoveCloudFromController", removeCloudFromControllerMethod)
+		r.AddMethod("JIMM", 3, "CrossModelQuery", crossModelQueryMethod)
 
 		// JIMM Generic RPC
 		r.AddMethod("JIMM", 4, "AddController", addControllerMethod)

diff --git a/internal/jujuapi/modelmanager_test.go b/internal/jujuapi/modelmanager_test.go
@@ -345,6 +345,7 @@ func (s *modelManagerSuite) TestModelInfo(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Error: &jujuparams.Error{
@@ -381,6 +382,7 @@ func (s *modelManagerSuite) TestModelInfo(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -433,6 +435,7 @@ func (s *modelManagerSuite) TestModelInfo(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -470,6 +473,7 @@ func (s *modelManagerSuite) TestModelInfo(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Error: &jujuparams.Error{
@@ -575,6 +579,7 @@ func (s *modelManagerSuite) TestModelInfoDisableControllerUUIDMasking(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -612,6 +617,7 @@ func (s *modelManagerSuite) TestModelInfoDisableControllerUUIDMasking(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -670,6 +676,7 @@ func (s *modelManagerSuite) TestModelInfoDisableControllerUUIDMasking(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -728,6 +735,7 @@ func (s *modelManagerSuite) TestModelInfoDisableControllerUUIDMasking(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Result: &jujuparams.ModelInfo{
@@ -765,6 +773,7 @@ func (s *modelManagerSuite) TestModelInfoDisableControllerUUIDMasking(c *gc.C) {
 				Description: "the version of Juju used by the model",
 				Version:     jujuVersion,
 			}},
+			DefaultBase: "[email protected]/stable",
 		},
 	}, {
 		Error: &jujuparams.Error{
@@ -810,7 +819,7 @@ var createModelTests = []struct {
 	region:        "no-such-region",
 	cloudTag:      names.NewCloudTag(jimmtest.TestCloudName).String(),
 	credentialTag: "",
-	expectError:   `cloudregion not found \(not found\)`,
+	expectError:   `failed to set cloud region \(not found\)`,
 }, {
 	about:         "local user",
 	name:          "model-4",

diff --git a/internal/jujuclient/modelmanager_test.go b/internal/jujuclient/modelmanager_test.go
@@ -183,7 +183,6 @@ func (s *modelmanagerSuite) TestRevokeModelAccessError(c *gc.C) {
 
 func (s *modelmanagerSuite) TestValidateModelUpgrade(c *gc.C) {
 	c.Skip("juju 3.x no longer implements this method")
-
 	ctx := context.Background()
 
 	args := jujuparams.ModelCreateArgs{