diff --git a/distribution/components.lock.yaml b/distribution/components.lock.yaml index a5de6c9..90e48d0 100644 --- a/distribution/components.lock.yaml +++ b/distribution/components.lock.yaml @@ -3,8 +3,8 @@ extensions: repository: https://github.com/runtimeconditions/extensions.git commit: dd96ddaebb0d29d882212d6ccc10c130f3ff2ddf goProfiler: - version: v0.6.1 - commit: c9fcd27dce1b29dfe3c024c9c87836059fd0854c + version: v0.7.0 + commit: 723d0fc266b37a6572230986ea2839c444d6eddd protocol: go-profiler-argv/v1 coreSchema: version: 0.4.0 @@ -13,18 +13,18 @@ goProfiler: sha256: 96d430c7936fcf7334aa9613f63bb306592e07cf56fe4154af57933d2c1480e6 platforms: darwin/amd64: - url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.6.1/go-rc-profiler_v0.6.1_darwin_amd64.tar.gz - archiveSHA256: 6c4be33b807b4a05253643a652740b7aae388e0f2376c5052c5c5a140fb99986 - executableSHA256: 372e855da1ff3cfee0c7af8e0b98eefd6db456c8e1f6c81bc7f1fb24e790ac2b + url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.7.0/go-rc-profiler_v0.7.0_darwin_amd64.tar.gz + archiveSHA256: 2eb400add968a18cf7613af0b8f6c14417bdaee281748ae499f49147f11dcaf6 + executableSHA256: 61f2cc30ec1858070d28638d5e7188ba94581d9f732f277deb9e8b6bdf32ff4d darwin/arm64: - url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.6.1/go-rc-profiler_v0.6.1_darwin_arm64.tar.gz - archiveSHA256: cb1f7b845141a741a83ad8a7eb03234b0729ef5865cb222e5c814a02816b1676 - executableSHA256: 3b1c271c99eac17f9c732a83ca8d5ac552827f24cc7dfe58cd572ca521eeceb6 + url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.7.0/go-rc-profiler_v0.7.0_darwin_arm64.tar.gz + archiveSHA256: ecf424865c501fa29e0e840acacd7bccf5bf23df0ebff5abb8d71a6ba6733096 + executableSHA256: 8654a5194e9fcbc0f4f4c7dbe27f3252f6c6cef6156eed72579a1ea9cfebbbdb linux/amd64: - url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.6.1/go-rc-profiler_v0.6.1_linux_amd64.tar.gz - archiveSHA256: 3580b761ed25afa86bb78730cc6996e4be29778508fd53c2edc9ab1acb01a429 - executableSHA256: bcaae5d7f5159b511edf62ff6bbc7e5ddda4e935eab442909583108798af3cc9 + url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.7.0/go-rc-profiler_v0.7.0_linux_amd64.tar.gz + archiveSHA256: d61e1f578bb7ce914c6eadc33ca15b86320be00f37e828d0393c5d51d9b4a248 + executableSHA256: a32ab012079a61b280ccdbad44770cb10f23ba4f07d40d7def513635b41c9d25 linux/arm64: - url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.6.1/go-rc-profiler_v0.6.1_linux_arm64.tar.gz - archiveSHA256: 8885052621a46a5259bafcfb49f252cf3443f6cd8bf9431a0ee8cf151a6d4a67 - executableSHA256: e4175f9edb2e11439f1b1b79b270d5bd2d54ea4d150462ad855efb765938e33a + url: https://github.com/runtimeconditions/go-rc-profiler/releases/download/v0.7.0/go-rc-profiler_v0.7.0_linux_arm64.tar.gz + archiveSHA256: 75983b9fa1c34247c85b272ff2ae057376d56fbea1f7dc1b368134b657086dcb + executableSHA256: 9bd6a33cd131dc52a00076f3bce676f2dd32e624c1304666fbda2e62c316b5ec diff --git a/go.mod b/go.mod index 76fbba8..fd96851 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/runtimeconditions/extensions/tooling/extension-bindings/emitters/go v0.0.0-20261111072413-dd96ddaebb0d github.com/runtimeconditions/extensions/tooling/extension-bindings/normalizer v0.0.0-20261111072413-dd96ddaebb0d github.com/runtimeconditions/extensions/tooling/extension-bindings/orchestrator v0.0.0-20261111072413-dd96ddaebb0d - github.com/runtimeconditions/go-rc-profiler v0.6.1 + github.com/runtimeconditions/go-rc-profiler v0.7.0 github.com/spf13/cobra v1.10.2 go.yaml.in/yaml/v3 v3.0.4 golang.org/x/mod v0.28.0 diff --git a/go.sum b/go.sum index 9097594..a445271 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ github.com/runtimeconditions/extensions/tooling/extension-bindings/orchestrator github.com/runtimeconditions/extensions/tooling/extension-bindings/orchestrator v0.0.0-20261111072413-dd96ddaebb0d/go.mod h1:57G6oeRpB8qTceNnLYZmIavqukZsSwTK7P0EZMeJJxc= github.com/runtimeconditions/go-rc-profiler v0.6.1 h1:lFatYU891EnZs5+N24HvzyLJ511+CrSKvg1iTOG4G0U= github.com/runtimeconditions/go-rc-profiler v0.6.1/go.mod h1:zQSOr50hlFxqJL2AaF3BpgTMbOlykey9OBa17E/jWFA= +github.com/runtimeconditions/go-rc-profiler v0.7.0 h1:u78auPN14C9LRnZKoRFp3ZdjBOv7NNAzKjCXmtaS80s= +github.com/runtimeconditions/go-rc-profiler v0.7.0/go.mod h1:zQSOr50hlFxqJL2AaF3BpgTMbOlykey9OBa17E/jWFA= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/santhosh-tekuri/jsonschema/v6 v6.0.3 h1:1EYB5IzjZawrrnELUi78f9fPu57HuXjmddZPjrls/28= github.com/santhosh-tekuri/jsonschema/v6 v6.0.3/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= diff --git a/scripts/ci-bindings-smoke.py b/scripts/ci-bindings-smoke.py index ccb7301..8ed40f6 100644 --- a/scripts/ci-bindings-smoke.py +++ b/scripts/ci-bindings-smoke.py @@ -136,7 +136,7 @@ def rc(*values, expected=0, selected=env, cwd=project): explicit = rc("profile", "go", "generate", *flags) require(default.stdout == explicit.stdout, "profile routes produced different bytes") profile = yaml.safe_load(default.stdout) - require(profile["extensions"] == [fixture["metadata"]["id"]] and profile["conditions"][0]["interface"] == {"type": "stream", "address": "example.test:1234"}, "generated profile differs from the fixture") + require(profile["extensions"] == ["https://bindings.example.test/parity:0.1.0"] and profile["conditions"][0]["interface"] == {"type": "stream", "address": "example.test:1234"}, "generated profile differs from the fixture") output = root / "profile.yaml" output.write_text("preserve existing profile\n") diff --git a/scripts/ci-smoke.go b/scripts/ci-smoke.go index 88b200c..cb57079 100644 --- a/scripts/ci-smoke.go +++ b/scripts/ci-smoke.go @@ -18,6 +18,7 @@ import ( ) const bindingModule = "runtimeconditions.io/x/rc/common" +const envBindingModule = "runtimeconditions.io/x/rc/env" const profilerModule = "github.com/runtimeconditions/go-rc-profiler" type options struct{ rc, fixture, version, commit, goVersion string } @@ -159,6 +160,7 @@ func smoke(o options) error { } for _, validation := range [][]string{ {"validate-extension", "--dir", workload, "--package", bindingModule}, + {"validate-extension", "--dir", workload, "--package", envBindingModule}, {"validate-extensions", "--dir", workload}, } { if _, err := rc(0, append(append([]string{}, route...), validation...)...); err != nil { @@ -209,8 +211,9 @@ func checkProfile(data string) error { } if profile.APIVersion != "runtimeconditions.io/v1alpha1" || profile.Kind != "RuntimeConditionsProfile" || profile.Metadata.Name != "ci-fixture" || profile.Workload.URI != "https://example.com/ci-fixture" || - profile.Workload.Version != "1.0.0" || len(profile.Extensions) != 1 || - !strings.HasPrefix(profile.Extensions[0], "https://runtimeconditions.io/extensions/rc/common-integrations") || + profile.Workload.Version != "1.0.0" || len(profile.Extensions) != 2 || + profile.Extensions[0] != "https://runtimeconditions.io/extensions/rc/common-integrations:v1alpha1" || + profile.Extensions[1] != "https://runtimeconditions.io/extensions/rc/env-configuration:v1alpha1" || len(profile.Conditions) != 1 || profile.Conditions[0].Kind != "cache" || profile.Conditions[0].Interface["type"] != "key_value" || profile.Conditions[0].Interface["engine"] != "redis" { return fmt.Errorf("unexpected generated profile:\n%s", data) diff --git a/testdata/ci/bindings/runtimeconditions.extension.yaml b/testdata/ci/bindings/runtimeconditions.extension.yaml index cbd3847..61d6883 100644 --- a/testdata/ci/bindings/runtimeconditions.extension.yaml +++ b/testdata/ci/bindings/runtimeconditions.extension.yaml @@ -1,7 +1,7 @@ apiVersion: runtimeconditions.io/v1alpha1 kind: RuntimeConditionsExtensionDefinition metadata: - id: https://bindings.example.test/parity:0.1.0 + id: https://bindings.example.test/parity/0.1.0/runtimeconditions.extension.yaml version: 0.1.0 spec: kinds: diff --git a/testdata/ci/go-project/go.mod b/testdata/ci/go-project/go.mod index 0dcadfd..49281e2 100644 --- a/testdata/ci/go-project/go.mod +++ b/testdata/ci/go-project/go.mod @@ -2,4 +2,7 @@ module example.com/rc-cli-ci-fixture go 1.25.0 -require runtimeconditions.io/x/rc/common v0.2.0 +require ( + runtimeconditions.io/x/rc/common v0.2.0 + runtimeconditions.io/x/rc/env v0.2.0 +) diff --git a/testdata/ci/go-project/go.sum b/testdata/ci/go-project/go.sum index c6f0506..e8c8b52 100644 --- a/testdata/ci/go-project/go.sum +++ b/testdata/ci/go-project/go.sum @@ -1,2 +1,4 @@ runtimeconditions.io/x/rc/common v0.2.0 h1:W1fdeprrNE2XdJUvtsEgclT1aRSJ3UPRus7oysE+VY8= runtimeconditions.io/x/rc/common v0.2.0/go.mod h1:VMdIVuWNgvHH+ywZ54l83ZrLfxjjiM743r93nj9MiPA= +runtimeconditions.io/x/rc/env v0.2.0 h1:7ejPceB2UTxP2BTzC5PWaa5GQku1zlESwjNgPDrtQ+o= +runtimeconditions.io/x/rc/env v0.2.0/go.mod h1:MFJzXA8LOlqch1VyXUmYlBapQ9uU6/UQTgKdDwxPfrM= diff --git a/testdata/ci/go-project/main.go b/testdata/ci/go-project/main.go index 138e045..4dc1af5 100644 --- a/testdata/ci/go-project/main.go +++ b/testdata/ci/go-project/main.go @@ -1,10 +1,18 @@ package main -import "runtimeconditions.io/x/rc/common" +import ( + "runtimeconditions.io/x/rc/common" + "runtimeconditions.io/x/rc/env" +) -var _ = common.Cache(common.KeyValue{ - Engine: &[]common.KeyValueEngine{common.KeyValueEngineRedis}[0], -}) +var _ = common.Cache( + common.KeyValue{Engine: &[]common.KeyValueEngine{common.KeyValueEngineRedis}[0]}, + env.KeyValueConfiguration{ + Env: env.KeyValueConfigurationEnv{ + {Name: "REDIS_URL", Property: env.KeyValueConfigurationEnvPropertyUrl, Required: &[]bool{true}[0]}, + }, + }, +) // Successful profiling must never execute the workload or its initializers. func init() {