Merge main jaas resources

.github/dependabot.yml

@@ -6,7 +6,13 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    labels:
+      - "hint/dependencies"
+      - "area/go"
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
       interval: "daily"
+    labels:
+      - "hint/dependencies"
+      - "area/go"

.github/workflows/canary.yml

@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         terraform:
-          - "1.8.*"
+          - "1.9.*"
         include:
           - cloud: "lxd"
             cloud-channel: "5.21/stable"

.github/workflows/cla.yml

@@ -0,0 +1,16 @@
+name: "CLA check"
+on: [pull_request, workflow_dispatch]
+
+permissions:
+  contents: read
+
+jobs:
+  cla-check:
+    permissions:
+      pull-requests: write  # for canonical/has-signed-canonical-cla to create & update comments
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if CLA signed
+        uses: canonical/[email protected]
+        with:
+          accept-existing-contributors: true

.github/workflows/k8s_tunnel.yml

@@ -44,7 +44,7 @@ jobs:
         cloud:
           - "microk8s"
         terraform:
-          - "1.8.*"
+          - "1.9.*"
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v4

.github/workflows/test_add_machine.yml

@@ -49,7 +49,7 @@ jobs:
         cloud:
           - "lxd"
         terraform:
-          - "1.8.*"
+          - "1.9.*"
         juju:
           - "2.9/stable"
           - "3/stable"

.github/workflows/test_integration.yml

@@ -49,7 +49,7 @@ jobs:
         action-operator:
           - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "2.9" }
           - { lxd-channel: "5.21/stable", cloud: "lxd", cloud-channel: "5.21", juju: "3" }
-          - { lxd-channel: "5.21/stable", cloud: "microk8s", cloud-channel: "1.28", juju: "2.9" }
+          - { lxd-channel: "5.21/stable", cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3.1" }
           - { lxd-channel: "5.21/stable", cloud: "microk8s", cloud-channel: "1.28-strict", juju: "3" }
     timeout-minutes: 60
     steps:

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.14.0 (September 9, 2024)
+
+NOTES:
+* **This release requires juju controller version 2.9.49 or later juju.**
+* This release uses juju client api code from the juju 3.5.1 release.
+
+ENHANCEMENTS:
+
+* Allow applications to specify charm resources as oci-image urls, in addition to revisions.
+
+BUG FIXES:
+
+* fix: bugs 535 and 539 only find storage for application being read by @hmlanigan in #557
+* fix (application): do no panic on nil pointer by @hmlanigan in #563
+* fix(constraints): ensure constraints are non-null by @jack-w-shaw in #556
+* fix(storagedirective): fix storage directive validator by @anvial in #538
+* fix(application): update resource example to use correct charm storage by @anvial in #533
+
 ## 0.13.0 (July 15, 2024)
 
 NOTES:

Makefile

@@ -14,7 +14,7 @@ GOOS=$(shell go env GOOS)
 GOARCH=$(shell go env GOARCH)
 GOPATH=$(shell go env GOPATH)
 PARALLEL_TEST_COUNT ?= 3
-EDGE_VERSION ?= 0.14.0
+EDGE_VERSION ?= 0.15.0
 REGISTRY_DIR=~/.terraform.d/plugins/registry.terraform.io/juju/juju/${EDGE_VERSION}/${GOOS}_${GOARCH}
 
 .PHONY: install

docs/resources/application.md

@@ -25,11 +25,15 @@ resource "juju_application" "this" {
     series   = "trusty"
   }
 
+  resources = {
+    gosherve-image = "gatici/gosherve:1.0"
+  }
+
   units = 3
 
   placement = "0,1,2"
 
-  storage = {
+  storage_directives = {
     files = "101M"
   }
 
@@ -55,17 +59,14 @@ resource "juju_application" "this" {
 - `expose` (Block List) Makes an application publicly available over the network (see [below for nested schema](#nestedblock--expose))
 - `name` (String) A custom name for the application deployment. If empty, uses the charm's name.
 - `placement` (String) Specify the target location for the application's units
-- `resources` (Map of Number) Charm resource revisions. Must evaluate to an integer.
-
-	There are a few scenarios that need to be considered:
-	* If the plan does not specify resource revision and resources are added to the plan,
-	resources with specified revisions will be attached to the application (equivalent
-	to juju attach-resource).
-	* If the plan does specify resource revisions and:
-		* If the charm revision or channel is updated, then resources get updated to the 
-		  latest revision.
-	    * If the charm revision or channel are not updated, then no changes will take 
-		  place (juju does not have an "un-attach" command for resources).
+- `resources` (Map of String) Charm resources. Must evaluate to a string. A resource could be a resource revision number from CharmHub or a custom OCI image resource.
+Specify a resource other than the default for a charm. Note that not all charms have resources.
+
+Notes:
+* A resource can be specified by a revision number or by URL to a OCI image repository. Resources of type 'file' can only be specified by revision number. Resources of type 'oci-image' can be specified by revision number or URL.
+* A resource can be added or changed at any time. If the charm has resources and None is specified in the plan, Juju will use the resource defined in the charm's specified channel.
+* If a charm is refreshed, by changing the charm revision or channel and if the resource is specified by a revision in the plan, Juju will use the resource defined in the plan.
+* Resources specified by URL to an OCI image repository will never be refreshed (upgraded) by juju during a charm refresh unless explicitly changed in the plan.
 - `storage` (Attributes Set) Storage used by the application. (see [below for nested schema](#nestedatt--storage))
 - `storage_directives` (Map of String) Storage directives (constraints) for the juju application. The map key is the label of the storage defined by the charm, the map value is the storage directive in the form <pool>,<count>,<size>. Changing an existing key/value pair will cause the application to be replaced. Adding a new key/value pair will add storage to the application on upgrade.
 - `trust` (Boolean) Set the trust for the application.

examples/resources/juju_application/resource.tf

@@ -10,11 +10,15 @@ resource "juju_application" "this" {
     series   = "trusty"
   }
 
+  resources = {
+    gosherve-image = "gatici/gosherve:1.0"
+  }
+
   units = 3
 
   placement = "0,1,2"
 
-  storage = {
+  storage_directives = {
     files = "101M"
   }
 

go.mod

@@ -14,14 +14,14 @@ require (
 	github.com/canonical/jimm-go-sdk/v3 v3.0.4
 	github.com/dustin/go-humanize v1.0.1
 	github.com/hashicorp/terraform-json v0.22.1
-	github.com/hashicorp/terraform-plugin-framework v1.9.0
-	github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
+	github.com/hashicorp/terraform-plugin-framework v1.10.0
+	github.com/hashicorp/terraform-plugin-framework-validators v0.13.0
 	github.com/hashicorp/terraform-plugin-go v0.23.0
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-testing v1.9.0
 	github.com/juju/charm/v12 v12.1.0
 	github.com/juju/clock v1.1.1
-	github.com/juju/cmd/v3 v3.0.15
+	github.com/juju/cmd/v3 v3.0.16
 	github.com/juju/collections v1.0.4
 	github.com/juju/errors v1.0.0
 	github.com/juju/names/v4 v4.0.0-20220207005702-9c6532a52823

go.sum

@@ -282,10 +282,10 @@ github.com/hashicorp/terraform-json v0.22.1 h1:xft84GZR0QzjPVWs4lRUwvTcPnegqlyS7
 github.com/hashicorp/terraform-json v0.22.1/go.mod h1:JbWSQCLFSXFFhg42T7l9iJwdGXBYV8fmmD6o/ML4p3A=
 github.com/hashicorp/terraform-plugin-docs v0.19.4 h1:G3Bgo7J22OMtegIgn8Cd/CaSeyEljqjH3G39w28JK4c=
 github.com/hashicorp/terraform-plugin-docs v0.19.4/go.mod h1:4pLASsatTmRynVzsjEhbXZ6s7xBlUw/2Kt0zfrq8HxA=
-github.com/hashicorp/terraform-plugin-framework v1.9.0 h1:caLcDoxiRucNi2hk8+j3kJwkKfvHznubyFsJMWfZqKU=
-github.com/hashicorp/terraform-plugin-framework v1.9.0/go.mod h1:qBXLDn69kM97NNVi/MQ9qgd1uWWsVftGSnygYG1tImM=
-github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 h1:HOjBuMbOEzl7snOdOoUfE2Jgeto6JOjLVQ39Ls2nksc=
-github.com/hashicorp/terraform-plugin-framework-validators v0.12.0/go.mod h1:jfHGE/gzjxYz6XoUwi/aYiiKrJDeutQNUtGQXkaHklg=
+github.com/hashicorp/terraform-plugin-framework v1.10.0 h1:xXhICE2Fns1RYZxEQebwkB2+kXouLC932Li9qelozrc=
+github.com/hashicorp/terraform-plugin-framework v1.10.0/go.mod h1:qBXLDn69kM97NNVi/MQ9qgd1uWWsVftGSnygYG1tImM=
+github.com/hashicorp/terraform-plugin-framework-validators v0.13.0 h1:bxZfGo9DIUoLLtHMElsu+zwqI4IsMZQBRRy4iLzZJ8E=
+github.com/hashicorp/terraform-plugin-framework-validators v0.13.0/go.mod h1:wGeI02gEhj9nPANU62F2jCaHjXulejm/X+af4PdZaNo=
 github.com/hashicorp/terraform-plugin-go v0.23.0 h1:AALVuU1gD1kPb48aPQUjug9Ir/125t+AAurhqphJ2Co=
 github.com/hashicorp/terraform-plugin-go v0.23.0/go.mod h1:1E3Cr9h2vMlahWMbsSEcNrOCxovCZhOOIXjFHbjc/lQ=
 github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
@@ -330,8 +330,8 @@ github.com/juju/charm/v12 v12.1.0 h1:V0M440FBP4ASRgA98jxEWqlcb38ahP0rus4u05ftPJ8
 github.com/juju/charm/v12 v12.1.0/go.mod h1:QRuKxXC5zzfPlAa8ipmxX1tvpbIBliueLVHGbs3T7wU=
 github.com/juju/clock v1.1.1 h1:NvgHG9DQmOpBevgt6gzkyimdWBooLXDy1cQn89qJzBI=
 github.com/juju/clock v1.1.1/go.mod h1:HIBvJ8kiV/n7UHwKuCkdYL4l/MDECztHR2sAvWDxxf0=
-github.com/juju/cmd/v3 v3.0.15 h1:/n/n/L4CX5hL9Bwkt9QV31Qsa3Vo8GB95gtpQPEIEb0=
-github.com/juju/cmd/v3 v3.0.15/go.mod h1:lGtDvm2BG+FKnIS8yY/vrhxQNX9imnL6bPIYGSTchuI=
+github.com/juju/cmd/v3 v3.0.16 h1:P/tG4BPtE+MsmECtnFx+KBC8NFi1ESvHbZ8NzMAll1g=
+github.com/juju/cmd/v3 v3.0.16/go.mod h1:lGtDvm2BG+FKnIS8yY/vrhxQNX9imnL6bPIYGSTchuI=
 github.com/juju/collections v1.0.4 h1:GjL+aN512m2rVDqhPII7P6qB0e+iYFubz8sqBhZaZtk=
 github.com/juju/collections v1.0.4/go.mod h1:hVrdB0Zwq9wIU1Fl6ItD2+UETeNeOEs+nGvJufVe+0c=
 github.com/juju/description/v5 v5.0.4 h1:qA35hRglZ47j1mmo9zUM9R+2WSDCH5dvL5ik7gA2aVE=