feat(k8s/amour): use structured image

should allow renovate to update digests, and should be a bit more clear.

deps.bzl

@@ -17,9 +17,9 @@ def dependencies():
     )
     http_archive(
         name = "com_github_tnarg_rules_cue",
-        sha256 = "88a52126d169ba7090335f872f6b42b9c8d625d5b362bf781d82efc553e37af3",
-        strip_prefix = "rules_cue-d7360f88423830afe3b4f2e334e9a6456d58f994",
-        urls = ["https://github.com/uhthomas/rules_cue/archive/d7360f88423830afe3b4f2e334e9a6456d58f994.tar.gz"],
+        sha256 = "f0869e8a8fe99a3cc0e967a4506c2c237f668a61a346211184ae576bc46b83cc",
+        strip_prefix = "rules_cue-a687771e1b85f7552f9f128f5231fe0e27ec97df",
+        urls = ["https://github.com/uhthomas/rules_cue/archive/a687771e1b85f7552f9f128f5231fe0e27ec97df.tar.gz"],
     )
     http_archive(
         name = "rules_proto",

k8s/amour/karma/BUILD.bazel

@@ -18,5 +18,6 @@ cue_library(
         "//cue.mod/gen/k8s.io/api/apps/v1:cue_v1_library",
         "//cue.mod/gen/k8s.io/api/core/v1:cue_v1_library",
         "//cue.mod/gen/k8s.io/api/networking/v1:cue_v1_library",
+        "//tools:cue_tools_library",
     ],
 )

k8s/amour/karma/deployment_list.cue

@@ -22,7 +22,7 @@ import (
 			spec: {
 				containers: [{
 					name:  "karma"
-					image: "ghcr.io/prymitive/karma:v\(#Version)"
+					image: _image.reference
 					ports: [{
 						name:          "http"
 						containerPort: 8080

k8s/amour/karma/list.cue

@@ -4,6 +4,8 @@ import (
 	"list"
 
 	"k8s.io/api/core/v1"
+
+	"github.com/uhthomas/automata/tools"
 )
 
 #Name:      "karma"
@@ -12,6 +14,14 @@ import (
 // renovate: datasource=github-releases depName=prymitive/karma extractVersion=^v(?<version>.*)$
 #Version: "0.116"
 
+_image: tools.#Image & {
+	name:   "ghcr.io/prymitive/karma"
+	tag:    "0.116"
+	digest: "sha256:ddfb0a874d24ca314457a74db351d59db1b9609206f4c01fc272b59a6867d374"
+}
+
+_image: tag: #Version
+
 #List: v1.#List & {
 	apiVersion: "v1"
 	kind:       "List"

renovate.json

@@ -42,7 +42,9 @@
       ],
       "matchStrings": [
         "image:\\s*\"(?<depName>[\\w\\/.-]*?):(?<currentValue>[\\w\\/.-]*?)\"",
-        "image:\\s*\"(?<depName>[\\w\\/.-]*?):(?<currentValue>[\\w\\/.-]*?)\"@(?<currentDigest>sha256:[a-f0-9]+)\""
+        "image:\\s*\"(?<depName>[\\w\\/.-]*?):(?<currentValue>[\\w\\/.-]*?)@(?<currentDigest>sha256:[a-f0-9]+)\"",
+        "name:\\s*\"(?<depName>[\\w\\/.-]*?)\"\\s*tag:\\s*\"(?<currentValue>[\\w\\/.-]*?)\"",
+        "name:\\s*\"(?<depName>[\\w\\/.-]*?)\"\\s*tag:\\s*\"(?<currentValue>[\\w\\/.-]*?)\"\\s*digest:\\s*\"(?<currentDigest>sha256:[a-f0-9]+)\""
       ],
       "datasourceTemplate": "docker",
       "versioningTemplate": "docker"

tools/BUILD.bazel

@@ -1,6 +1,14 @@
+load("@com_github_tnarg_rules_cue//cue:cue.bzl", "cue_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
 go_test(
     name = "tools_test",
     srcs = ["tools_test.go"],
 )
+
+cue_library(
+    name = "cue_tools_library",
+    srcs = ["image.cue"],
+    importpath = "github.com/uhthomas/automata/tools",
+    visibility = ["//visibility:public"],
+)

tools/image.cue

@@ -0,0 +1,19 @@
+package tools
+
+import "strings"
+
+#Image: {
+	name:    string
+	tag:     string
+	digest?: string & strings.HasPrefix("sha256:")
+
+	if tag == "" && digest == "" {
+		reference: name
+	}
+	if tag != "" && digest == "" {
+		reference: "\(name):\(tag)"
+	}
+	if tag != "" && digest != "" {
+		reference: "\(name):\(tag)@\(digest)"
+	}
+}