diff --git a/Makefile b/Makefile index 12edcdec9..8205529ea 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ TKN_IMG ?= quay.io/redhat-developer/mapt:v${VERSION}-tkn # Integrations # renovate: datasource=github-releases depName=cirruslabs/cirrus-cli -CIRRUS_CLI ?= v0.165.2 +CIRRUS_CLI ?= v1.0.0 # renovate: datasource=github-releases depName=actions/runner GITHUB_RUNNER ?= 2.334.0 # renovate: datasource=gitlab-releases depName=gitlab-org/gitlab-runner diff --git a/go.mod b/go.mod index 318de17db..3977764b4 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/mapt-oss/pulumi-ibmcloud/sdk v0.0.12 github.com/pulumi/pulumi-command/sdk v1.2.1 github.com/pulumi/pulumi-random/sdk/v4 v4.21.0 - github.com/pulumi/pulumi/sdk/v3 v3.243.0 + github.com/pulumi/pulumi/sdk/v3 v3.244.0 github.com/sirupsen/logrus v1.9.4 github.com/spf13/cobra v1.10.2 ) @@ -22,7 +22,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.1 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7 v7.3.0 - github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.10.0 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.7.0 github.com/IBM/go-sdk-core/v5 v5.21.3 @@ -35,27 +35,30 @@ require ( github.com/pulumi/pulumi-aws-native/sdk v1.66.0 github.com/pulumi/pulumi-aws/sdk/v7 v7.30.0 github.com/pulumi/pulumi-awsx/sdk/v3 v3.5.0 - github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.18.0 - github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.18.0 + github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.19.0 + github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.19.0 github.com/pulumi/pulumi-gitlab/sdk/v8 v8.11.0 github.com/pulumi/pulumi-tls/sdk/v5 v5.5.0 - golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a + golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 k8s.io/apimachinery v0.36.1 k8s.io/client-go v0.36.1 ) require ( + github.com/charmbracelet/bubbles v1.0.0 // indirect + github.com/charmbracelet/bubbletea v1.3.10 // indirect github.com/gabriel-vasile/mimetype v1.4.13 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect + github.com/muesli/reflow v0.3.0 // indirect github.com/pgavlin/fx/v2 v2.0.12 // indirect - github.com/pulumi/pulumi-azure-native-sdk/v3 v3.18.0 // indirect + github.com/pulumi/pulumi-azure-native-sdk/v3 v3.19.0 // indirect ) require ( @@ -68,7 +71,6 @@ require ( github.com/evertras/bubble-table v0.19.2 // indirect github.com/hashicorp/hcl/v2 v2.24.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/muesli/reflow v0.3.0 // indirect github.com/oliveagle/jsonpath v0.1.4 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/sahilm/fuzzy v0.1.2 // indirect @@ -83,7 +85,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.2.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.7.2 // indirect github.com/BurntSushi/toml v1.6.0 // indirect - github.com/IBM/platform-services-go-sdk v0.97.4 // indirect + github.com/IBM/platform-services-go-sdk v0.98.0 // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect @@ -100,13 +102,13 @@ require ( github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/charmbracelet/bubbles v1.0.0 // indirect - github.com/charmbracelet/bubbletea v1.3.10 // indirect + // github.com/charmbracelet/bubbles v1.0.0 // indirect + // github.com/charmbracelet/bubbletea v1.3.10 // indirect github.com/charmbracelet/colorprofile v0.4.3 // indirect github.com/charmbracelet/lipgloss v1.1.0 // indirect github.com/charmbracelet/x/ansi v0.11.7 // indirect github.com/charmbracelet/x/cellbuf v0.0.15 // indirect - github.com/charmbracelet/x/exp/golden v0.0.0-20260524005558-961435f30453 // indirect + github.com/charmbracelet/x/exp/golden v0.0.0-20260601140041-e36ca9b00c4e // indirect github.com/charmbracelet/x/term v0.2.2 // indirect github.com/clipperhouse/displaywidth v0.11.0 // indirect github.com/clipperhouse/uax29/v2 v2.7.0 // indirect @@ -123,8 +125,8 @@ require ( github.com/go-openapi/jsonpointer v0.23.1 // indirect github.com/go-openapi/jsonreference v0.21.6 // indirect github.com/go-openapi/loads v0.23.3 // indirect - github.com/go-openapi/runtime v0.31.0 // indirect - github.com/go-openapi/runtime/server-middleware v0.30.0 // indirect + github.com/go-openapi/runtime v0.32.2 // indirect + github.com/go-openapi/runtime/server-middleware v0.32.2 // indirect github.com/go-openapi/spec v0.22.4 // indirect github.com/go-openapi/strfmt v0.26.3 // indirect github.com/go-openapi/swag v0.26.0 // indirect @@ -170,7 +172,7 @@ require ( github.com/pjbgf/sha1cd v0.6.0 // indirect github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 // indirect - github.com/pulumi/esc v0.24.0 // indirect + github.com/pulumi/esc v0.25.0 // indirect github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.18 // indirect github.com/pulumi/pulumi-docker/sdk/v4 v4.5.8 // indirect github.com/sagikazarmark/locafero v0.12.0 // indirect @@ -183,14 +185,14 @@ require ( github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/zclconf/go-cty v1.18.1 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/collector/featuregate v1.58.0 // indirect - go.opentelemetry.io/collector/pdata v1.58.0 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/sdk v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/collector/featuregate v1.59.0 // indirect + go.opentelemetry.io/collector/pdata v1.59.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.opentelemetry.io/proto/otlp v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect @@ -198,8 +200,8 @@ require ( golang.org/x/oauth2 v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/time v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260523011958-0a33c5d7ca68 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.140.0 // indirect @@ -217,8 +219,8 @@ require ( github.com/IBM/vpc-go-sdk v0.83.2 github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.4.1 // indirect - github.com/aws/aws-sdk-go-v2/service/ecs v1.80.0 - github.com/aws/aws-sdk-go-v2/service/iam v1.53.12 + github.com/aws/aws-sdk-go-v2/service/ecs v1.82.0 + github.com/aws/aws-sdk-go-v2/service/iam v1.54.0 github.com/blang/semver v3.5.1+incompatible // indirect github.com/cheggaaa/pb v1.0.29 // indirect github.com/djherbis/times v1.6.0 // indirect @@ -243,7 +245,7 @@ require ( github.com/pkg/term v1.1.0 // indirect github.com/pulumi/pulumi-kubernetes/sdk/v4 v4.31.1 github.com/rivo/uniseg v0.4.7 // indirect - github.com/rogpeppe/go-internal v1.14.1 // indirect + github.com/rogpeppe/go-internal v1.15.0 // indirect github.com/sergi/go-diff v1.4.0 // indirect github.com/spf13/pflag v1.0.10 github.com/spf13/viper v1.21.0 diff --git a/go.sum b/go.sum index 243ece2c4..708c02435 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v3 v3.2.0 h1:+lnL github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v3 v3.2.0/go.mod h1:tStOHrivWUrcBolspvKV70Us1ckESYGYSHdG4LX8zyY= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.2.0 h1:akP6VpxJGgQRpDR1P462piz/8OhYLRCreDj48AyNabc= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/managementgroups/armmanagementgroups v1.2.0/go.mod h1:8wzvopPfyZYPaQUoKW87Zfdul7jmJMDfp/k7YY3oJyA= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0 h1:zLzoX5+W2l95UJoVwiyNS4dX8vHyQ6x2xRLoBBL9wMk= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0/go.mod h1:wVEOJfGTj0oPAUGA1JuRAvz/lxXQsWW16axmHPP47Bk= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.10.0 h1:+1fJwTilk/X7inNqwREnYEOgFCdg8ut7GULxARDbu34= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.10.0/go.mod h1:EGwSLlGqrrfYQhtCi9JcIkPQKl9WxsL6ZPJd+63Vy1A= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeployments v1.0.0 h1:67nFqWXpo0x5Nz0XEb1yI7s8D+EHy8NsTinYw9sZnLk= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armdeployments v1.0.0/go.mod h1:fewgRjNVE84QVVh798sIMFb7gPXPp7NmnekGnboSnXk= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 h1:Dd+RhdJn0OTtVGaeDLZpcumkIVCtA/3/Fo42+eoYvVM= @@ -42,8 +42,8 @@ github.com/IBM-Cloud/power-go-client v1.15.0 h1:bXkcx9DlhCmNr9w2xHI9lpzjkfM7uLVv github.com/IBM-Cloud/power-go-client v1.15.0/go.mod h1:UTyMxybFDj0xHNalAIC5qfRZs16gOSDzPFfUOWnRD64= github.com/IBM/go-sdk-core/v5 v5.21.3 h1:5HVPZu3aOdPHkqUGdyrmpuh8I/X+sdyog6HSLzahfHQ= github.com/IBM/go-sdk-core/v5 v5.21.3/go.mod h1:cZJMMEImJkIXCd61kHeDFtjbdDpXq4ua4ITrwpBYdWs= -github.com/IBM/platform-services-go-sdk v0.97.4 h1:UiHTDanRY+Laydss68GFLHqoOy4l7VCj0dBNFgdGlYU= -github.com/IBM/platform-services-go-sdk v0.97.4/go.mod h1:t93mozFmKrxexnKNdx2gNOtEI9Wd62dKAVffQYm0vRM= +github.com/IBM/platform-services-go-sdk v0.98.0 h1:Ff9LULrp/dlu/vIGZOeSdROWiAa4fKVbuZaAqc1aFFk= +github.com/IBM/platform-services-go-sdk v0.98.0/go.mod h1:t93mozFmKrxexnKNdx2gNOtEI9Wd62dKAVffQYm0vRM= github.com/IBM/vpc-go-sdk v0.83.2 h1:RLMha7+buktU9hrhvAMF2QRHIvxaAsuU14W6akybJqs= github.com/IBM/vpc-go-sdk v0.83.2/go.mod h1:85bJ/0FS7vYAifHdZvlnXypf8pQSmuf9kxReDDI5ZdY= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= @@ -83,10 +83,10 @@ github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26 h1:A1PmWU2zfkIm9EyFlJncFXL4W4p github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.26/go.mod h1:dY4MRzXEizrD4hqtpKvWVGPX7QleSGGVY+EBolo1RmM= github.com/aws/aws-sdk-go-v2/service/ec2 v1.304.2 h1:puQq1j5XHH/zaeAJS8ngKUaBAlg70VStCvhwH69Vr4o= github.com/aws/aws-sdk-go-v2/service/ec2 v1.304.2/go.mod h1:BmEhUktSbAPK6oedmAp9w/j4Yaa2WqTmNTQ4ovydhX4= -github.com/aws/aws-sdk-go-v2/service/ecs v1.80.0 h1:orZYOYtvYU7A45XTWC/UchWSkkdWjOyXi8MYksnmQf0= -github.com/aws/aws-sdk-go-v2/service/ecs v1.80.0/go.mod h1:TIKZ9zIFS6W2k9FeW+r5sGVnlxp+aUt9oQ/St3Suj1o= -github.com/aws/aws-sdk-go-v2/service/iam v1.53.12 h1:nmWprhv80J825VaeJLIoLymyPbYOTqlKH8OqjLlWDG0= -github.com/aws/aws-sdk-go-v2/service/iam v1.53.12/go.mod h1:nLv8xEWcYrOTFwomMo1ItTUFuG1HNjvU6ZaX0ZDB1BU= +github.com/aws/aws-sdk-go-v2/service/ecs v1.82.0 h1:Dk+yHrjwOzRIFT+kyRWcNPBM2p9wBuTPXlRH/5LZn10= +github.com/aws/aws-sdk-go-v2/service/ecs v1.82.0/go.mod h1:fy9/mpkxXirhLwLF0v63BMXzqsy1wwp7eG45U9elb9w= +github.com/aws/aws-sdk-go-v2/service/iam v1.54.0 h1:i3YpG+QUhBF2WFAB4+xeuazlkk7w0Kt2RKR/44jfkmg= +github.com/aws/aws-sdk-go-v2/service/iam v1.54.0/go.mod h1:nLv8xEWcYrOTFwomMo1ItTUFuG1HNjvU6ZaX0ZDB1BU= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10 h1:d5/908OJ4bXg8lyjeMPvXetEKqoDoLi5Owy1zNue3yg= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.10/go.mod h1:a57l7Hwh+FWI+we50g5NPJHYUKeJKfXbc4w8SyXu8Ig= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.18 h1:W/EyPFl9A5rXrtoilfwHYEvzHER+K4SpBPtMXi24Mos= @@ -135,8 +135,8 @@ github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dA github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ= github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI= github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q= -github.com/charmbracelet/x/exp/golden v0.0.0-20260524005558-961435f30453 h1:HEnx3OklM+uM4hklLr5lUnQFZQofRWyP3iF4NK/0owY= -github.com/charmbracelet/x/exp/golden v0.0.0-20260524005558-961435f30453/go.mod h1:6fMpcW6iwN/kX+xJ52eqVWsDiBTe0UJD24JLoHFe+P0= +github.com/charmbracelet/x/exp/golden v0.0.0-20260601140041-e36ca9b00c4e h1:lnQ7vb36GesIqIP+ycKHpmxiGJ7J+RDIHFzCPvoGy8I= +github.com/charmbracelet/x/exp/golden v0.0.0-20260601140041-e36ca9b00c4e/go.mod h1:6fMpcW6iwN/kX+xJ52eqVWsDiBTe0UJD24JLoHFe+P0= github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk= github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI= github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo= @@ -213,10 +213,10 @@ github.com/go-openapi/jsonreference v0.21.6 h1:NZ5nGfnaM1n4I43Xjm1e5/M2GjOwQwndQ github.com/go-openapi/jsonreference v0.21.6/go.mod h1:xzbgtQ3ZbWxvET3AxdzCJlJt6vkovbf+IfSPJjD0tUY= github.com/go-openapi/loads v0.23.3 h1:g5Xap1JfwKkUnZdn+S0L3SzBDpcTIYzZ5Qaag0YDkKQ= github.com/go-openapi/loads v0.23.3/go.mod h1:NOH07zLajXo8y55hom0omlHWDVVvCwBM/S+csCK8LqA= -github.com/go-openapi/runtime v0.31.0 h1:vhmlo1LMjGXYTlYB0eFm0tTVuAidDHtmrL1nAABzUCg= -github.com/go-openapi/runtime v0.31.0/go.mod h1:fZnoje1YWt7IrH/fHBOS1h9+VzeS1d0cHj8TTkZOaRc= -github.com/go-openapi/runtime/server-middleware v0.30.0 h1:8rPoJ/xv7JL8BsovaqboKETlpWBArVh8n+0L/GyePog= -github.com/go-openapi/runtime/server-middleware v0.30.0/go.mod h1:OYNT/TxNvB/VK5oe4htM2jDTwlEXuejVJmu0DVZfAMs= +github.com/go-openapi/runtime v0.32.2 h1:X9mZz716lFwYZ6bFV1BBnthNdHTy46zKM5Em4D1UISI= +github.com/go-openapi/runtime v0.32.2/go.mod h1:IfM3cpgencPuwBp5Uo16i2IQaE74odL7Q4DCGovIQac= +github.com/go-openapi/runtime/server-middleware v0.32.2 h1:fuWQmduxHbEjBuRkQ3c7pI5YKSuPCJ2RHeZafceo2yw= +github.com/go-openapi/runtime/server-middleware v0.32.2/go.mod h1:fYPep4GdTwg/XqZUjR40uIM/8C12Ba5M+MrGCiwpTHo= github.com/go-openapi/spec v0.22.4 h1:4pxGjipMKu0FzFiu/DPwN3CTBRlVM2yLf/YTWorYfDQ= github.com/go-openapi/spec v0.22.4/go.mod h1:WQ6Ai0VPWMZgMT4XySjlRIE6GP1bGQOtEThn3gcWLtQ= github.com/go-openapi/strfmt v0.26.3 h1:rzmslHarJgBbf2qfGge+X3htclQfmXqBZMm0Too0HhU= @@ -247,8 +247,8 @@ github.com/go-openapi/swag/typeutils v0.26.0 h1:2kdEwdiNWy+JJdOvu5MA2IIg2SylWAFu github.com/go-openapi/swag/typeutils v0.26.0/go.mod h1:oovDuIUvTrEHVMqWilQzKzV4YlSKgyZmFh7AlfABNVE= github.com/go-openapi/swag/yamlutils v0.26.0 h1:H7O8l/8NJJQ/oiReEN+oMpnGMyt8G0hl460nRZxhLMQ= github.com/go-openapi/swag/yamlutils v0.26.0/go.mod h1:1evKEGAtP37Pkwcc7EWMF0hedX0/x3Rkvei2wtG/TbU= -github.com/go-openapi/testify/enable/yaml/v2 v2.5.0 h1:3hZD1fwydvCx/cc1R2uYNQirHqf2s6lqpKV3FcNTURA= -github.com/go-openapi/testify/enable/yaml/v2 v2.5.0/go.mod h1:TvDZKBH7ZbMaF3EqH2AwTvNQCmzyZq8K1agRjf1B+Nk= +github.com/go-openapi/testify/enable/yaml/v2 v2.5.1 h1:q9NtHwK4qHF7yZziBPvZyv7zWAIk8ok88Gh2mR6Jpc8= +github.com/go-openapi/testify/enable/yaml/v2 v2.5.1/go.mod h1:JW0MXIotCYps/XsgJnG3a8Q7rE5xAiBwoOD5OfaIQBk= github.com/go-openapi/testify/v2 v2.5.1 h1:TMdhCaw8fUNraVSf3Omoob1dO/AzBfhtFAPW0an6sBo= github.com/go-openapi/testify/v2 v2.5.1/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw= github.com/go-openapi/validate v0.25.3 h1:4nzAIavcJ7WveHK2+V1UAkZK3kWcjzxZCzjfZAfavKs= @@ -406,30 +406,30 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231 h1:vkHw5I/plNdTr435cARxCW6q9gc0S/Yxz7Mkd38pOb0= github.com/pulumi/appdash v0.0.0-20231130102222-75f619a67231/go.mod h1:murToZ2N9hNJzewjHBgfFdXhZKjY3z5cYC1VXk+lbFE= -github.com/pulumi/esc v0.24.0 h1:sCtiB0qbyrlU1ZNzJn4dTLYiChl8xeCBFbHWl1YoXJg= -github.com/pulumi/esc v0.24.0/go.mod h1:eCOOkcDJS6eooGwdE4/E0+pOsvUWG254+KBmPCFwJpA= +github.com/pulumi/esc v0.25.0 h1:U31tSec7ikQuj4RG3Nhm3mqBz/dp+2MQDLA3bY6/v3w= +github.com/pulumi/esc v0.25.0/go.mod h1:A6rZBVCQBZepaOyt+xoZjPHtC4kKqxapkJ8wKB5VT7k= github.com/pulumi/pulumi-aws-native/sdk v1.66.0 h1:U4RQneKxQXCh6E/NF1wHKR4n1rzp4arxqypNFqifD0A= github.com/pulumi/pulumi-aws-native/sdk v1.66.0/go.mod h1:08HfiYFanToWN1uRzHgjoXUNGyzKG3vHthcmZ/a1s5A= github.com/pulumi/pulumi-aws/sdk/v7 v7.30.0 h1:CJBeCvVfMmy7f0vPZHIxkYQOsBpx6cfKUzt7oE4P4WQ= github.com/pulumi/pulumi-aws/sdk/v7 v7.30.0/go.mod h1:iri0lya1u/qsulT5drsRvV/50gAX1WyvGA7BkKIFCAI= github.com/pulumi/pulumi-awsx/sdk/v3 v3.5.0 h1:4yNWM2R0VrF7nG2D6BjBkrxZcR2XHz3M/tYUwOS/5OY= github.com/pulumi/pulumi-awsx/sdk/v3 v3.5.0/go.mod h1:2/RMtCM6nOYsWHV0rFZRze7PdSMIKM61ZHbDGEwMaOs= -github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.18.0 h1:XfRC4pGdf5iC2Egz/51EXvPOPkinlKdNVCmEq0bJz50= -github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.18.0/go.mod h1:Wt/LGzzZ2wJta2hr/TJ0cwya0Yqh8N16jsN11ezBxHs= -github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.18.0 h1:SQYQTHWnNaEvsf7UMeA3p6ncjPrIDM5a/Ky77AGXtqQ= -github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.18.0/go.mod h1:AEoPbO9BZjrKxk6hfKGayaHUY8fl7FMx9HXExJwCH/Q= -github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.18.0 h1:j/zFfxOt3bVV4Hwjy+uj0JNq9DiFhZsSmJyJcaXigkc= -github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.18.0/go.mod h1:ebW+JOvQedu3MjJ6jTLIlYXj6NL2UXbC/AOSgahgWP4= -github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.18.0 h1:FjOwouOoqMPD7d83p8nWnLEx4uOzU5ixrErXxI6vRH4= -github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.18.0/go.mod h1:Zj6gIZ+v28mfcIHiSCwLw9UBzCNAq52ZyjLKG84Pg8k= -github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.18.0 h1:YVU6yLOqW+TgQDFPaQACPSkH7dsQsI21/Y9Zh0vV3o0= -github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.18.0/go.mod h1:SSCwa/VGPpEtGyEUVdJoM1YcyST6avNEixqFzE3lL1Y= -github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.18.0 h1:W3xPFjfb9xCCE4o1jYdnDJf99jUhneGk/m63K/2aFZs= -github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.18.0/go.mod h1:ixsBsua33txN73fppK//TjDGjucxgm94cTOZiVBmnj0= -github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.18.0 h1:sW0eGp5/Rrc5ZRiC38n/O26SwdNjjYKj0mhJzdsumh4= -github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.18.0/go.mod h1:rc3cQtJdk1p2SvwTieNJYnUae0BfTwil8hBZgZJZfMM= -github.com/pulumi/pulumi-azure-native-sdk/v3 v3.18.0 h1:stWEc+bQf7V6Qc1NYDuoUNJAtLJ3eEMOe1HuCE22RuM= -github.com/pulumi/pulumi-azure-native-sdk/v3 v3.18.0/go.mod h1:wgsFRstMxKSnIyav7GRRTn6mvKO6rmu/cOTDr+0eqPU= +github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.19.0 h1:qSpiQvycpUPJyIQEcBIsiP2wrKBKQNM3PXtttPl4Vkk= +github.com/pulumi/pulumi-azure-native-sdk/authorization/v3 v3.19.0/go.mod h1:0xOUSkalPeYZE2BGk975hSKZGn9SICiEwy3YZsP/v9c= +github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.19.0 h1:WV3JU8+jNTl8PTnSl2zhW3f7dJhXtGb7Q/Wr2cTvuLg= +github.com/pulumi/pulumi-azure-native-sdk/compute/v3 v3.19.0/go.mod h1:9iOwnUb5srlgllv9+3LZb+fYxu19uc+7GdQPGDWYeRQ= +github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.19.0 h1:99HKM5tLq4jJrQcNwbNFUZVbP0vof5nDzACH8/xVf/8= +github.com/pulumi/pulumi-azure-native-sdk/containerservice/v3 v3.19.0/go.mod h1:6h/wsAp5M/qQJc5OfR1wbFkkuBnXchLBWKnTR11F2wQ= +github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.19.0 h1:5W39yiR35qRnVSr5EpHXz6UGJWAUj4ujbb3T6DPG9Y4= +github.com/pulumi/pulumi-azure-native-sdk/managedidentity/v3 v3.19.0/go.mod h1:H0fpTdqWWoF5BX1foc7BxgzP8RxcEQ/XanmdxqwR76g= +github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.19.0 h1:+CCZOMS3gq4z/ZmdaKS9F4LBxCpTx+Cfle7oe+96A3I= +github.com/pulumi/pulumi-azure-native-sdk/network/v3 v3.19.0/go.mod h1:sGIuj4G+1C/U1sK2o38VRnoCBpo2f7OK+1FTXc21fsY= +github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.19.0 h1:gOQnr5npDQn8AAkZVBzPpLTmZG6OL0A0WlKFdQ9q2eM= +github.com/pulumi/pulumi-azure-native-sdk/resources/v3 v3.19.0/go.mod h1:cSHCoJyV/NsjWLO7Gk8Tr2Tr+gvqNbErfo8jVviOWUA= +github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.19.0 h1:6i9JNUWSVxYyn2BUoDM/SISYwtcaOu2t/tXFWw9g9vE= +github.com/pulumi/pulumi-azure-native-sdk/storage/v3 v3.19.0/go.mod h1:0wlEqTNa4j4H+RptqYjDY8vFj1ebHIf70Zoyp75P/b0= +github.com/pulumi/pulumi-azure-native-sdk/v3 v3.19.0 h1:Mfl+Z1zZuLXuEn//PRi8mnnA1Bb7R2VOmuc4JWOPyTo= +github.com/pulumi/pulumi-azure-native-sdk/v3 v3.19.0/go.mod h1:qniEet/A/m6/0IFkzN0IWI0VMl5fkI5r27RPAqA2dtM= github.com/pulumi/pulumi-command/sdk v1.2.1 h1:mAziZ91a/9U+5IjZH5Skcar80OSmpBSYljeQNRblTWQ= github.com/pulumi/pulumi-command/sdk v1.2.1/go.mod h1:hQxv9DXg6bFjcd9BEiNdMImQ/V1rnC9D115q5VXYNps= github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.18 h1:emkSEfjXfz7i2vNDi43WTqABhP9TY2mQnO2zdL683hw= @@ -444,14 +444,14 @@ github.com/pulumi/pulumi-random/sdk/v4 v4.21.0 h1:j6LtoXue77y16trYOR40iqCUxXxv8T github.com/pulumi/pulumi-random/sdk/v4 v4.21.0/go.mod h1:92+w+95clbBPdrYdi0uCajihmgol52w/pWgZJ9wT0To= github.com/pulumi/pulumi-tls/sdk/v5 v5.5.0 h1:oNZILwuCvNpiXMDkvagEEvdHUMEHo/UxqMKcn6aS7mg= github.com/pulumi/pulumi-tls/sdk/v5 v5.5.0/go.mod h1:cLzvf6CO+f/Wae6OcOaJQh9B5K6RtErETjX9TQ8XrDg= -github.com/pulumi/pulumi/sdk/v3 v3.243.0 h1:pZaMx58nXrdh4XB0cgTlHnL3EMy3/JQwuin3aDuWyRM= -github.com/pulumi/pulumi/sdk/v3 v3.243.0/go.mod h1:BPWWuYPXcPH5YbXGoyy9Rrfa+evrh6IdM51AjDhcDpM= +github.com/pulumi/pulumi/sdk/v3 v3.244.0 h1:oyQ9bwDE58wrQOqS70JrojJSlNoLcVhVcQgK4yusgcg= +github.com/pulumi/pulumi/sdk/v3 v3.244.0/go.mod h1:BPWWuYPXcPH5YbXGoyy9Rrfa+evrh6IdM51AjDhcDpM= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= -github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= +github.com/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc= +github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4= github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI= @@ -508,26 +508,26 @@ github.com/zclconf/go-cty v1.18.1 h1:yEGE8M4iIZlyKQURZNb2SnEyZlZHUcBCnx6KF81KuwM github.com/zclconf/go-cty v1.18.1/go.mod h1:qpnV6EDNgC1sns/AleL1fvatHw72j+S+nS+MJ+T2CSg= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/collector/featuregate v1.58.0 h1:Kh6Dpgbxywv/Q3D6qPehaSxNCxvr/U/ki7CL4y3udCo= -go.opentelemetry.io/collector/featuregate v1.58.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU= -go.opentelemetry.io/collector/internal/testutil v0.152.0 h1:8LGwekR7mLcUDhT1ofLmdnrHRFuUa3U7PBd95ZvJEjQ= -go.opentelemetry.io/collector/internal/testutil v0.152.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE= -go.opentelemetry.io/collector/pdata v1.58.0 h1:5Lxut3NxKp87066Pzt+3q7+JUuFI5B3teCyLZIF8wIs= -go.opentelemetry.io/collector/pdata v1.58.0/go.mod h1:4vZtODINbC/JF3eGocnatdImzbRHseOywIcr+aULjCg= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 h1:RAE+JPfvEmvy+0LzyUA25/SGawPwIUbZ6u0Wug54sLc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0/go.mod h1:AGmbycVGEsRx9mXMZ75CsOyhSP6MFIcj/6dnG+vhVjk= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/collector/featuregate v1.59.0 h1:pu70/9eWRjAjzGnr3VmqwY+k6fmU3esLp15AqxfBBz0= +go.opentelemetry.io/collector/featuregate v1.59.0/go.mod h1:4ga1QBMPEejXXmpyJS8lmaRpknJ3Lb9Bvk6e420bUFU= +go.opentelemetry.io/collector/internal/testutil v0.153.0 h1:GJEaPLohao+7wtm08yGf73RGi1rpIHvqzxOb7Xn8sP0= +go.opentelemetry.io/collector/internal/testutil v0.153.0/go.mod h1:Jkjs6rkqs973LqgZ0Fe3zrokQRKULYXPIf4HuqStiEE= +go.opentelemetry.io/collector/pdata v1.59.0 h1:lO1IcaO9+HUVdFh+RATCUG3oTP+uCZzsE7HJ0MjmzRc= +go.opentelemetry.io/collector/pdata v1.59.0/go.mod h1:AH6M14C6qhesnUpcvigkvFMiX9KtdSWQENMBNyNhe7I= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0 h1:4YsVu3B8+3qtWYYrsUYgn0OG78pN0rnNPRGX4SbokQI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.44.0/go.mod h1:+wnlSn0mD1ADVMe3v9Z/WIaiz6q6gL2J/ejaAmdmv80= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0 h1:qazEJlUOQzhCpzQpFETGby7EdqjI1wsd0W+6Gg1SCTU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.44.0/go.mod h1:fOD2Yefuxixkx3ahVNf0O/PERb6r4OlbxfATVnYvzCo= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g= go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk= go.opentelemetry.io/proto/slim/otlp v1.10.0 h1:iR97Vs/ZDR+y9TfuP9b1XBtdPWeC+OMslIBmhcLU7jM= @@ -552,8 +552,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a h1:+3jdDGGB8NGb1Zktc737jlt3/A5f6UlwSzmvqUuufxw= -golang.org/x/exp v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw= +golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9 h1:4d4PbuBNwaxMXkXI8yiIYjydtMU+04RHeuSxJdgKftM= +golang.org/x/exp v0.0.0-20260529124908-c761662dc8c9/go.mod h1:d2fgXJLVs4dYDHUk5lwMIfzRzSrWCfGZb0ZqeLa/Vcw= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -617,10 +617,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260523011958-0a33c5d7ca68 h1:WVVw1Nl19li0fMX++FJ3ye1z9+S1N35QODDy5qpnaXw= -google.golang.org/genproto/googleapis/api v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:1dCETSCY2YKZNXQE3h4fun3TYwF5p8jejRKZgfWAgAY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68 h1:PvEgGJf9C/1u5CHkInMg7UFYYUoiaQmW2LbtH0pjB78= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= +google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af h1:+5/Sw3GsDNlEmu7TfklWKPdQ0Ykja5VEmq2i817+jbI= diff --git a/oci/Containerfile b/oci/Containerfile index 09b69e946..2bf04f0a8 100644 --- a/oci/Containerfile +++ b/oci/Containerfile @@ -1,12 +1,12 @@ -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:1c1259373e6feb4b57de490452379c40888cf6e876154cd2ace17eae9c64a7ea as builder +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 as builder ARG TARGETARCH USER root WORKDIR /workspace COPY . . # renovate: datasource=github-releases depName=pulumi/pulumi -ENV PULUMI_VERSION 3.243.0 +ENV PULUMI_VERSION 3.244.0 ENV PULUMI_BASE_URL="https://github.com/pulumi/pulumi/releases/download/v${PULUMI_VERSION}/pulumi-v${PULUMI_VERSION}" ENV PULUMI_URL="${PULUMI_BASE_URL}-linux-x64.tar.gz" @@ -18,7 +18,7 @@ RUN unset VERSION \ && curl -L ${PULUMI_URL} -o pulumicli.tar.gz \ && tar -xzvf pulumicli.tar.gz -FROM registry.access.redhat.com/ubi9/go-toolset@sha256:1c1259373e6feb4b57de490452379c40888cf6e876154cd2ace17eae9c64a7ea +FROM registry.access.redhat.com/ubi9/go-toolset@sha256:a2ba4645e7c424b08aa83ed7792e279683b0d33acbc5131b18183fd21e336c55 ARG TARGETARCH LABEL org.opencontainers.image.authors="Redhat Developer" @@ -31,11 +31,11 @@ ENV AWS_SDK_LOAD_CONFIG=1 \ # Pulumi plugins # renovate: datasource=github-releases depName=pulumi/pulumi-aws -ARG PULUMI_AWS_VERSION=v7.30.0 +ARG PULUMI_AWS_VERSION=v7.32.0 # renovate: datasource=github-releases depName=pulumi/pulumi-awsx ARG PULUMI_AWSX_VERSION=v3.5.0 # renovate: datasource=github-releases depName=pulumi/pulumi-azure-native -ARG PULUMI_AZURE_NATIVE_VERSION=v3.18.0 +ARG PULUMI_AZURE_NATIVE_VERSION=v3.19.0 # renovate: datasource=github-releases depName=pulumi/pulumi-command ARG PULUMI_COMMAND_VERSION=v1.2.1 # renovate: datasource=github-releases depName=pulumi/pulumi-tls @@ -43,7 +43,7 @@ ARG PULUMI_TLS_VERSION=v5.5.0 # renovate: datasource=github-releases depName=pulumi/pulumi-random ARG PULUMI_RANDOM_VERSION=v4.21.0 # renovate: datasource=github-releases depName=pulumi/pulumi-aws-native -ARG PULUMI_AWS_NATIVE_VERSION=v1.66.0 +ARG PULUMI_AWS_NATIVE_VERSION=v1.68.0 # renovate: datasource=github-releases depName=pulumi/pulumi-gitlab ARG PULUMI_GITLAB_VERSION=v9.11.0 # renovate: datasource=github-releases depName=mapt-oss/pulumi-ibmcloud diff --git a/tools/go.mod b/tools/go.mod index f94dc86ba..3291919ab 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/redhat-developer/mapt/tools -go 1.25.7 +go 1.26.0 replace ( github.com/charmbracelet/bubbles/v2 => charm.land/bubbles/v2 v2.1.0 @@ -13,23 +13,22 @@ require github.com/golangci/golangci-lint/v2 v2.12.2 require ( dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect github.com/bombsimon/wsl/v4 v4.7.0 // indirect - // github.com/denis-tingaikin/go-header v1.0.0 // indirect - github.com/dlclark/regexp2 v1.12.0 // indirect - github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect + // github.com/golangci/gofmt v0.0.0-20251215234548-e7be49a5ab4d // indirect // github.com/golangci/golines v0.15.0 // indirect github.com/ryancurrah/gomodguard v1.4.1 // indirect - go.yaml.in/yaml/v2 v2.4.3 // indirect ) require ( charm.land/lipgloss/v2 v2.0.3 // indirect github.com/ClickHouse/clickhouse-go-linter v1.2.1 // indirect github.com/bombsimon/wsl/v5 v5.8.0 // indirect - github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3 // indirect + github.com/charmbracelet/ultraviolet v0.0.0-20260601155805-6cf7526a1b3f // indirect github.com/charmbracelet/x/termios v0.1.1 // indirect github.com/charmbracelet/x/windows v0.2.2 // indirect github.com/clipperhouse/displaywidth v0.11.0 // indirect github.com/denis-tingaikin/go-header v0.5.0 // indirect + github.com/dlclark/regexp2/v2 v2.1.1 // indirect + github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect github.com/golangci/golines v0.15.0 // indirect github.com/golangci/rowserrcheck v0.0.0-20260430141503-8d53bbc4a7d3 // indirect github.com/muesli/cancelreader v0.2.2 // indirect @@ -67,7 +66,7 @@ require ( github.com/Djarvur/go-err113 v0.1.1 // indirect github.com/Masterminds/semver/v3 v3.5.0 // indirect github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect - github.com/alecthomas/chroma/v2 v2.24.1 // indirect + github.com/alecthomas/chroma/v2 v2.26.1 // indirect github.com/alecthomas/go-check-sumtype v0.3.1 // indirect github.com/alexkohler/nakedret/v2 v2.0.6 // indirect // github.com/alexkohler/prealloc v1.1.0 // indirect @@ -170,7 +169,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.23.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.5 // indirect + github.com/prometheus/common v0.68.0 // indirect github.com/prometheus/procfs v0.20.1 // indirect github.com/quasilyte/go-ruleguard v0.4.5 // indirect github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect @@ -179,14 +178,14 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/raeperd/recvcheck v0.3.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/rogpeppe/go-internal v1.14.1 // indirect + github.com/rogpeppe/go-internal v1.15.0 // indirect github.com/ryanrolds/sqlclosecheck v0.6.0 // indirect github.com/sagikazarmark/locafero v0.12.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect - github.com/securego/gosec/v2 v2.26.1 // indirect + github.com/securego/gosec/v2 v2.27.1 // indirect github.com/sirupsen/logrus v1.9.4 // indirect github.com/sivchari/containedctx v1.0.3 // indirect github.com/sonatard/noctx v0.5.1 // indirect @@ -221,7 +220,7 @@ require ( go.augendre.info/fatcontext v0.9.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20260508232706-74f9aab9d74a // indirect + golang.org/x/exp/typeparams v0.0.0-20260529124908-c761662dc8c9 // indirect golang.org/x/mod v0.36.0 // indirect golang.org/x/sync v0.20.0 // indirect golang.org/x/sys v0.45.0 // indirect diff --git a/tools/go.sum b/tools/go.sum index 39cf6437f..e73ed250b 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -40,8 +40,8 @@ github.com/OpenPeeDeeP/depguard/v2 v2.2.1 h1:vckeWVESWp6Qog7UZSARNqfu/cZqvki8zsu github.com/OpenPeeDeeP/depguard/v2 v2.2.1/go.mod h1:q4DKzC4UcVaAvcfd41CZh0PWpGgzrVxUYBlgKNGquUo= github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM= -github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI= +github.com/alecthomas/chroma/v2 v2.26.1 h1:2X21EdxGZNv5GF9mG5u+uzc02GCFyGxbcBm3Grd9A78= +github.com/alecthomas/chroma/v2 v2.26.1/go.mod h1:lxhRRa9H4hPmRLOOdYga4zkQIQjq3dtrrdwQeCfu78Y= github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU= github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E= github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs= @@ -88,8 +88,8 @@ github.com/charithe/durationcheck v0.0.11 h1:g1/EX1eIiKS57NTWsYtHDZ/APfeXKhye1Di github.com/charithe/durationcheck v0.0.11/go.mod h1:x5iZaixRNl8ctbM+3B2RrPG5t856TxRyVQEnbIEM2X4= github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q= github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q= -github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3 h1:pxGjlWZFcRQMWAdtjRelpL3Gbu8iYIyuO3Eqbd037Ow= -github.com/charmbracelet/ultraviolet v0.0.0-20260511121909-c840852527f3/go.mod h1:SnKWaPaTnkTNXJgdgdquu66de12V8pW/b/qlTGaF9xg= +github.com/charmbracelet/ultraviolet v0.0.0-20260601155805-6cf7526a1b3f h1:vKsPSlO4g4jKfJ9enESgNZ45BkbHngTIq3UxNOzic74= +github.com/charmbracelet/ultraviolet v0.0.0-20260601155805-6cf7526a1b3f/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY= github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI= github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ= github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk= @@ -120,6 +120,8 @@ github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42 github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY= github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8= github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2/v2 v2.1.1 h1:LCUGyd9Wf+r+VVOl8Ny38JTpWJcAsdVnCIuhhtthmKw= +github.com/dlclark/regexp2/v2 v2.1.1/go.mod h1:avUrQvPaLz2DrFNHJF0taWAFFX2C1GMSSoeiqFjcBmU= github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q= github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A= github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= @@ -202,8 +204,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 h1:z2ogiKUYzX5Is6zr/vP9vJGqPwcdqsWjOt+V8J7+bTc= -github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= +github.com/google/pprof v0.0.0-20260507013755-92041b743c96 h1:YDDnaZ9afWajDboPMt9Vikqca/yWAX7KAxVzb4lJU1M= +github.com/google/pprof v0.0.0-20260507013755-92041b743c96/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs= github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw= github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= @@ -307,10 +309,10 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nunnatsa/ginkgolinter v0.23.0 h1:x3o4DGYOWbBMP/VdNQKgSj+25aJKx2Pe6lHr8gBcgf8= github.com/nunnatsa/ginkgolinter v0.23.0/go.mod h1:9qN1+0akwXEccwV1CAcCDfcoBlWXHB+ML9884pL4SZ4= -github.com/onsi/ginkgo/v2 v2.28.2 h1:DTrMfpqxiNUyQ3Y0zhn1n3cOO2euFgQPYIpkWwxVFps= -github.com/onsi/ginkgo/v2 v2.28.2/go.mod h1:CLtbVInNckU3/+gC8LzkGUb9oF+e8W8TdUsxPwvdOgE= -github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28= -github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg= +github.com/onsi/ginkgo/v2 v2.29.0 h1:rfh+ZFjgJhYWRoIqVf3Uwx/W20yLrcrE2h2GmYVRaag= +github.com/onsi/ginkgo/v2 v2.29.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= +github.com/onsi/gomega v1.41.0 h1:OwKp4pXNgVxf6sCplzYo794OFNuoL2q2SBMU5NSWOjA= +github.com/onsi/gomega v1.41.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= @@ -326,8 +328,8 @@ github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4= -github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= +github.com/prometheus/common v0.68.0 h1:8rQJvQmYltsR2L7h8Zw0Iyj8WYNNmpwikoQTZXwfVeA= +github.com/prometheus/common v0.68.0/go.mod h1:4soH+U8yJSROk7OJ//hmTiWKsxapv6zRGgTt3keN8gQ= github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc= github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= github.com/quasilyte/go-ruleguard v0.4.5 h1:AGY0tiOT5hJX9BTdx/xBdoCubQUAE2grkqY2lSwvZcA= @@ -344,8 +346,8 @@ github.com/raeperd/recvcheck v0.3.0 h1:PM+XYvyxIj3bo+kobJfFTdTuU3Lmfu96mKDbyHDbR github.com/raeperd/recvcheck v0.3.0/go.mod h1:PZNwG+HztFYMH2ZPq0Hu3QgkV2yiA6VrtNz9c1fXWJo= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= -github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= -github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= +github.com/rogpeppe/go-internal v1.15.0 h1:D0RCU5rMAp+SpgkiNdrjfJ+LX4J1M32V2NeCY7EJ6hc= +github.com/rogpeppe/go-internal v1.15.0/go.mod h1:DrUVZyrJU+txYW5/1kwtXQSMFio52ZOxX7yM1VHvnxs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.4.1 h1:eWC8eUMNZ/wM/PWuZBv7JxxqT5fiIKSIyTvjb7Elr+g= github.com/ryancurrah/gomodguard v1.4.1/go.mod h1:qnMJwV1hX9m+YJseXEBhd2s90+1Xn6x9dLz11ualI1I= @@ -363,8 +365,8 @@ github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tM github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= github.com/sashamelentyev/usestdlibvars v1.29.0 h1:8J0MoRrw4/NAXtjQqTHrbW9NN+3iMf7Knkq057v4XOQ= github.com/sashamelentyev/usestdlibvars v1.29.0/go.mod h1:8PpnjHMk5VdeWlVb4wCdrB8PNbLqZ3wBZTZWkrpZZL8= -github.com/securego/gosec/v2 v2.26.1 h1:gdkttGhQFVehqRJ8grKH4DrpqM/QlPKNHBnl8QgcEC4= -github.com/securego/gosec/v2 v2.26.1/go.mod h1:57UW4p0uoP3kxoTkhoo3axLdVAi+OWrLg/Ax/kdqtPE= +github.com/securego/gosec/v2 v2.27.1 h1:bg4lZnpCCpC8e5l0K+ADF5gG91jmT2LQgOcOflwBfJI= +github.com/securego/gosec/v2 v2.27.1/go.mod h1:lbgwsogcxq9aoN62Bk/vcdWwemFjlT5NPF/D/dH4+Ho= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= @@ -455,8 +457,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= -go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ= +go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -467,8 +469,8 @@ golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/y golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20260508232706-74f9aab9d74a h1:H06+n8uULVXJdhbdJ9+40jLzRcAPQP2h1UXcs01jzsk= -golang.org/x/exp/typeparams v0.0.0-20260508232706-74f9aab9d74a/go.mod h1:PqrXSW65cXDZH0k4IeUbhmg/bcAZDbzNz3byBpKCsXo= +golang.org/x/exp/typeparams v0.0.0-20260529124908-c761662dc8c9 h1:+fQIRiP9clFFkNieeqLley4NLoTYWIZeHZ/lfWB10aw= +golang.org/x/exp/typeparams v0.0.0-20260529124908-c761662dc8c9/go.mod h1:PqrXSW65cXDZH0k4IeUbhmg/bcAZDbzNz3byBpKCsXo= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -486,8 +488,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= -golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= +golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= +golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/.golangci.yml b/tools/vendor/github.com/alecthomas/chroma/v2/.golangci.yml index 91f313b1a..a345ac652 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/.golangci.yml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/.golangci.yml @@ -1,89 +1,122 @@ +version: "2" run: tests: true - output: - print-issued-lines: false - + show-stats: false + formats: + text: + print-issued-lines: false + colors: true linters: - enable-all: true + default: all disable: - - lll - - gocyclo + - exhaustive + - prealloc - dupl - - gochecknoglobals - - funlen - - godox - - wsl - - gocognit - - nolintlint - - testpackage - - godot - - nestif - - paralleltest - - nlreturn + - godoclint - cyclop - - gci - - gofumpt - - errorlint - - exhaustive - - wrapcheck - - stylecheck - - thelper - - nonamedreturns - - revive + - depguard - dupword + - err113 + - errname + - errorlint - exhaustruct - - varnamelen + - forbidigo - forcetypeassert + - funlen + - gochecknoglobals + - gocognit + - gocritic + - gocyclo + - godot + - godox + - gomoddirectives - ireturn + - lll - maintidx - - govet - - testableexamples - - musttag - - depguard - - goconst - - perfsprint - mnd + - nakedret + - nestif + - nilnil + - nlreturn + - nolintlint + - nonamedreturns + - paralleltest + - perfsprint - predeclared - recvcheck - - tenv - - err113 - -linters-settings: - gocyclo: - min-complexity: 10 - dupl: - threshold: 100 - goconst: - min-len: 8 - min-occurrences: 3 - forbidigo: - #forbid: - # - (Must)?NewLexer$ - exclude_godoc_examples: false - - + - revive + - testpackage + - varnamelen + - wastedassign + - whitespace + - wsl + - wsl_v5 + - funcorder + - noinlineerr + - tagalign + - goconst + - gochecknoinits + - durationcheck + - embeddedstructfieldcheck + - wrapcheck + - gomodguard + settings: + dupl: + threshold: 100 + exhaustive: + default-signifies-exhaustive: true + goconst: + min-len: 8 + min-occurrences: 3 + gocyclo: + min-complexity: 10 + wrapcheck: + report-internal-errors: false + ignore-package-globs: + - github.com/alecthomas/errors + exclusions: + generated: lax + rules: + - path: (.+)\.go$ + text: "^(G104|G204|G307|G304):" + - path: (.+)\.go$ + text: Error return value of .(.*\.Help|.*\.MarkFlagRequired|(os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked + - path: (.+)\.go$ + text: exported method `(.*\.MarshalJSON|.*\.UnmarshalJSON|.*\.EntityURN|.*\.GoString|.*\.Pos)` should have comment or be unexported + - path: (.+)\.go$ + text: uses unkeyed fields + - path: (.+)\.go$ + text: declaration of "err" shadows declaration + - path: (.+)\.go$ + text: bad syntax for struct tag key + - path: (.+)\.go$ + text: bad syntax for struct tag pair + - path: (.+)\.go$ + text: ^ST1012 + - path: (.+)\.go$ + text: log/slog.Logger.*must not be called + - path: (.+)_test\.go$ + text: error returned from external package is unwrapped + - linters: [staticcheck] + text: QF1008 + - text: "Error return value of `.*.Write` is not checked" + linters: [errcheck] + path: (.+)_test\.go$ + paths: + - third_party$ + - builtin$ + - examples$ issues: - exclude-dirs: - - _examples - max-per-linter: 0 - max-same: 0 - exclude-use-default: false - exclude: - # Captured by errcheck. - - '^(G104|G204):' - # Very commonly not checked. - - 'Error return value of .(.*\.Help|.*\.MarkFlagRequired|(os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked' - - 'exported method (.*\.MarshalJSON|.*\.UnmarshalJSON|.*\.EntityURN|.*\.GoString|.*\.Pos) should have comment or be unexported' - - 'composite literal uses unkeyed fields' - - 'declaration of "err" shadows declaration' - - 'should not use dot imports' - - 'Potential file inclusion via variable' - - 'should have comment or be unexported' - - 'comment on exported var .* should be of the form' - - 'at least one file in a package should have a package comment' - - 'string literal contains the Unicode' - - 'methods on the same type should have the same receiver name' - - '_TokenType_name should be _TokenTypeName' - - '`_TokenType_map` should be `_TokenTypeMap`' - - 'rewrite if-else to switch statement' + max-issues-per-linter: 0 + max-same-issues: 0 +formatters: + enable: + - gofmt + - goimports + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/AGENTS.md b/tools/vendor/github.com/alecthomas/chroma/v2/AGENTS.md index 0d3b6ee49..d15d770ab 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/AGENTS.md +++ b/tools/vendor/github.com/alecthomas/chroma/v2/AGENTS.md @@ -1,6 +1,6 @@ Chroma is a syntax highlighting library, tool and web playground for Go. It is based on Pygments and includes importers for it, so most of the same concepts from Pygments apply to Chroma. -This project is written in Go, uses Hermit to manage tooling, and Just for helper commands. Helper scripts are in ./scripts. +This project is written in Go, uses Hermit to manage tooling, and Just for helper commands. Helper tooling is primarily in ./_tools. Language definitions are XML files defined in ./lexers/embedded/*.xml. diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/BUILD.bit b/tools/vendor/github.com/alecthomas/chroma/v2/BUILD.bit new file mode 100644 index 000000000..7f3b5ef83 --- /dev/null +++ b/tools/vendor/github.com/alecthomas/chroma/v2/BUILD.bit @@ -0,0 +1,84 @@ +let version = exec("git describe --tags --dirty --always") | trim +# TinyGo's installation root; used to source `wasm_exec.js`. +let tinygoroot = exec("tinygo env TINYGOROOT") | trim + + +# Generate tokentype_enumer.go from types.go via `//go:generate`. +tokentype = go.generate { + package = "." + inputs = ["types.go"] + outputs = ["tokentype_enumer.go"] +} + +# Regenerate the lexer table in README.md by invoking the host `chroma` binary. +# GOOS/GOARCH are cleared so cross-compile env vars don't break the local run. +protected readme = exec { + command = "./table.py" + inputs = ["table.py", "lexers/**/*.go", "lexers/**/*.xml"] + output = "README.md" +} + +# Format frontend JS sources in place. Runs as a sub-step of `index-min-js`, +# so bundling always sees formatted sources. +format-js = exec { + command = "biome format --write cmd/chromad/static/index.js cmd/chromad/static/chroma.js" + inputs = ["biome.js", "cmd/chromad/static/index.js", "cmd/chromad/static/chroma.js"] +} + +# Copy TinyGo's wasm_exec.js into the chromad static assets. +wasm-exec = exec { + command = "install -m644 '#{tinygoroot}/targets/wasm_exec.js' cmd/chromad/static/wasm_exec.js" + resolve = "sha256 '#{tinygoroot}/targets/wasm_exec.js'" + output = "cmd/chromad/static/wasm_exec.js" +} + +# Build the chroma WASM module via tinygo (installed via hermit) for the +# smaller output binary. +chroma-wasm = exec { + command = "tinygo build -no-debug -target wasm -o cmd/chromad/static/chroma.wasm cmd/libchromawasm/main.go" + inputs = ["cmd/libchromawasm/**/*.go", "*.go", "lexers/**/*.go", "lexers/**/*.xml", "formatters/**/*.go", "styles/**/*.go"] + output = "cmd/chromad/static/chroma.wasm" +} + +# Bundle and minify the frontend JS. Depends on `format-js` so the bundle +# always reflects formatted sources. +index-min-js = exec { + command = "esbuild --platform=browser --format=esm --bundle cmd/chromad/static/index.js --minify --external:./wasm_exec.js --outfile=cmd/chromad/static/index.min.js" + inputs = ["cmd/chromad/static/index.js", "cmd/chromad/static/chroma.js"] + output = "cmd/chromad/static/index.min.js" + depends_on = [format-js] +} + +# Bundle and minify the frontend CSS. +index-min-css = exec { + command = "esbuild --bundle cmd/chromad/static/index.css --minify --outfile=cmd/chromad/static/index.min.css" + inputs = ["cmd/chromad/static/index.css", "cmd/chromad/static/bulma.css"] + output = "cmd/chromad/static/index.min.css" +} + +# Build the chromad server binary. cmd/chromad is a separate Go module, so +# `dir` puts the build in there and `package = "."` resolves against that +# module. `output` stays project-root-relative; bit absolutises it before +# passing to `go build -o`. Defaults to linux/amd64 to match the deploy +# target; override with GOOS/GOARCH env vars for local builds. +chromad = go.exe { + dir = "cmd/chromad" + package = "." + output = "build/chromad" + flags = ["-ldflags", "-X 'main.version=#{version}'"] + goos = env("GOOS", "linux") + goarch = env("GOARCH", "amd64") + cgo = false + depends_on = [wasm-exec, chroma-wasm, index-min-js, index-min-css] +} + +# Deploy chromad to swapoff.org. Must be explicitly selected. +explicit upload = exec { + command = <<-EOF + scp #{chromad.path} root@swapoff.org: + ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart' + EOF + depends_on = [chromad] +} + +target default = [chromad, readme, tokentype] diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/Bitfile b/tools/vendor/github.com/alecthomas/chroma/v2/Bitfile deleted file mode 100644 index bf158633a..000000000 --- a/tools/vendor/github.com/alecthomas/chroma/v2/Bitfile +++ /dev/null @@ -1,24 +0,0 @@ -VERSION = %(git describe --tags --dirty --always)% -export CGOENABLED = 0 - -tokentype_enumer.go: types.go - build: go generate - -# Regenerate the list of lexers in the README -README.md: lexers/*.go lexers/*/*.xml table.py - build: ./table.py - -clean - -implicit %{1}%{2}.min.%{3}: **/*.{css,js} - build: esbuild --bundle %{IN} --minify --outfile=%{OUT} - -implicit build/%{1}: cmd/* - cd cmd/%{1} - inputs: cmd/%{1}/**/* **/*.go - build: go build -ldflags="-X 'main.version=%{VERSION}'" -o ../../build/%{1} . - -#upload: chromad -# build: -# scp chromad root@swapoff.org: -# ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart' -# touch upload diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/Justfile b/tools/vendor/github.com/alecthomas/chroma/v2/Justfile index 24e3816f1..4db3dc319 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/Justfile +++ b/tools/vendor/github.com/alecthomas/chroma/v2/Justfile @@ -1,4 +1,4 @@ -set positional-arguments := true +set positional-arguments set shell := ["bash", "-c"] version := `git describe --tags --dirty --always` @@ -21,6 +21,10 @@ tokentype-string: format-js: biome format --write cmd/chromad/static/index.js cmd/chromad/static/chroma.js +# Tidy Go modules +tidy: + find . -name 'go.mod' -execdir go mod tidy \; + # Build chromad binary chromad: wasm-exec chroma-wasm #!/usr/bin/env bash diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/README.md b/tools/vendor/github.com/alecthomas/chroma/v2/README.md index d67476958..df962da7b 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/README.md +++ b/tools/vendor/github.com/alecthomas/chroma/v2/README.md @@ -36,25 +36,25 @@ translators for Pygments lexers and styles. | Prefix | Language | :----: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -| A | ABAP, ABNF, ActionScript, ActionScript 3, Ada, Agda, AL, Alloy, AMPL, Angular2, ANTLR, ApacheConf, APL, AppleScript, ArangoDB AQL, Arduino, ArmAsm, ATL, AutoHotkey, AutoIt, Awk +| A | ABAP, ABNF, ActionScript, ActionScript 3, Ada, Agda, AL, Alloy, AMPL, Angular2, ANTLR, ApacheConf, APL, AppleScript, ArangoDB AQL, Arduino, ArmAsm, Arturo, ATL, AutoHotkey, AutoIt, Awk | B | Ballerina, Bash, Bash Session, Batchfile, Beef, BibTeX, Bicep, BlitzBasic, BNF, BQN, Brainfuck | C | C, C#, C++, C3, Caddyfile, Caddyfile Directives, Cap'n Proto, Cassandra CQL, Ceylon, CFEngine3, cfstatement, ChaiScript, Chapel, Cheetah, Clojure, CMake, COBOL, CoffeeScript, Common Lisp, Coq, Core, Crystal, CSS, CSV, CUE, Cython -| D | D, Dart, Dax, Desktop file, Diff, Django/Jinja, dns, Docker, DTD, Dylan -| E | EBNF, Elixir, Elm, EmacsLisp, Erlang +| D | D, Dart, Dax, Desktop file, Devicetree, Diff, Django/Jinja, dns, Docker, DTD, Dylan +| E | EBNF, Elixir, Elm, EmacsLisp, ERB, Erlang | F | Factor, Fennel, Fish, Forth, Fortran, FortranFixed, FSharp | G | GAS, GDScript, GDScript3, Gemtext, Genshi, Genshi HTML, Genshi Text, Gettext, Gherkin, Gleam, GLSL, Gnuplot, Go, Go HTML Template, Go Template, Go Text Template, GraphQL, Groff, Groovy | H | Handlebars, Hare, Haskell, Haxe, HCL, Hexdump, HLB, HLSL, HolyC, HTML, HTTP, Hy | I | Idris, Igor, INI, Io, ISCdhcpd | J | J, Janet, Java, JavaScript, JSON, JSONata, Jsonnet, Julia, Jungle -| K | Kakoune, Kotlin -| L | Lean4, Lighttpd configuration file, LLVM, lox, Lua, Luau -| M | Makefile, Mako, markdown, Markless, Mason, Materialize SQL dialect, Mathematica, Matlab, MCFunction, Meson, Metal, MiniZinc, MLIR, Modelica, Modula-2, Mojo, MonkeyC, MoonScript, MorrowindScript, Myghty, MySQL +| K | Kakoune, KDL, Kotlin +| L | Lateralus, Lean4, Lighttpd configuration file, LilyPond, LLVM, lox, Lua, Luau +| M | Makefile, Mako, markdown, Markless, Mason, Materialize SQL dialect, Mathematica, Matlab, MCFunction, Meson, Metal, microcad, MiniZinc, MLIR, Modelica, Modula-2, Mojo, MonkeyC, MoonBit, MoonScript, MorrowindScript, Myghty, MySQL | N | NASM, Natural, NDISASM, Newspeak, Nginx configuration file, Nim, Nix, NSIS, Nu | O | Objective-C, ObjectPascal, OCaml, Octave, Odin, OnesEnterprise, OpenEdge ABL, OpenSCAD, Org Mode | P | PacmanConf, Perl, PHP, PHTML, Pig, PkgConfig, PL/pgSQL, plaintext, Plutus Core, Pony, PostgreSQL SQL dialect, PostScript, POVRay, PowerQuery, PowerShell, Prolog, Promela, PromQL, properties, Protocol Buffer, Protocol Buffer Text Format, PRQL, PSL, Puppet, Python, Python 2 | Q | QBasic, QML | R | R, Racket, Ragel, Raku, react, ReasonML, reg, Rego, reStructuredText, Rexx, RGBDS Assembly, Ring, RPGLE, RPMSpec, Ruby, Rust -| S | SAS, Sass, Scala, Scheme, Scilab, SCSS, Sed, Sieve, Smali, Smalltalk, Smarty, SNBT, Snobol, Solidity, SourcePawn, Spade, SPARQL, SQL, SquidConf, Standard ML, stas, Stylus, Svelte, Swift, SYSTEMD, systemverilog +| S | SAS, Sass, Scala, scdoc, Scheme, Scilab, SCSS, Sed, Sieve, Smali, Smalltalk, Smarty, SNBT, Snobol, Solidity, SourcePawn, Spade, SPARQL, SQL, SquidConf, Standard ML, stas, Stylus, Svelte, Swift, SYSTEMD, systemverilog | T | TableGen, Tal, TASM, Tcl, Tcsh, Termcap, Terminfo, Terraform, TeX, Thrift, TOML, TradingView, Transact-SQL, Turing, Turtle, Twig, TypeScript, TypoScript, TypoScriptCssData, TypoScriptHtmlData, Typst | U | ucode | V | V, V shell, Vala, VB.net, verilog, VHDL, VHS, VimL, vue @@ -276,6 +276,8 @@ for that setup the `chroma` executable can be just symlinked to `~/.lessfilter`. its input using Chroma * [Hugo](https://gohugo.io/) is a static site generator that [uses Chroma for syntax highlighting code examples](https://gohugo.io/content-management/syntax-highlighting/) +* [f4](https://github.com/unxed/f4) is asynchronious cross platform Far Manager clone in Go + that uses Chroma for syntax highlighting in built-in editor ## Testing lexers diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/colour.go b/tools/vendor/github.com/alecthomas/chroma/v2/colour.go index e33d01060..8add068dc 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/colour.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/colour.go @@ -52,7 +52,7 @@ type Colour int32 // NewColour creates a Colour directly from RGB values. func NewColour(r, g, b uint8) Colour { - return ParseColour(fmt.Sprintf("%02x%02x%02x", r, g, b)) + return Colour(int32(r)<<16|int32(g)<<8|int32(b)) + 1 } // Distance between this colour and another. diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go b/tools/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go index 1aaafd0f4..b4995864e 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go @@ -4,6 +4,7 @@ import ( "fmt" "html" "io" + "slices" "sort" "strconv" "strings" @@ -241,7 +242,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma. fmt.Fprintf(w, "body { %s; }\n", css[chroma.Background]) fmt.Fprint(w, "") } - fmt.Fprintf(w, "\n", f.styleAttr(css, chroma.Background)) + fmt.Fprintf(w, "\n", f.styleAttrWithMode(css, chroma.Background, style)) } wrapInTable := f.lineNumbers && f.lineNumbersInTable @@ -252,10 +253,10 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma. if wrapInTable { // List line numbers in its own - fmt.Fprintf(w, "\n", f.styleAttr(css, chroma.PreWrapper)) + fmt.Fprintf(w, "\n", f.styleAttrWithMode(css, chroma.PreWrapper, style)) fmt.Fprintf(w, "", f.styleAttr(css, chroma.LineTable)) fmt.Fprintf(w, "\n", f.styleAttr(css, chroma.LineTableTD)) - fmt.Fprintf(w, "%s", f.preWrapper.Start(false, f.styleAttr(css, chroma.PreWrapper))) + fmt.Fprintf(w, "%s", f.preWrapper.Start(false, f.styleAttrWithMode(css, chroma.PreWrapper, style))) for index := range lines { line := f.baseLineNumber + index highlight, next := f.shouldHighlight(highlightIndex, line) @@ -277,7 +278,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma. fmt.Fprintf(w, "\n", f.styleAttr(css, chroma.LineTableTD, "width:100%")) } - fmt.Fprintf(w, "%s", f.preWrapper.Start(true, f.styleAttr(css, chroma.PreWrapper))) + fmt.Fprintf(w, "%s", f.preWrapper.Start(true, f.styleAttrWithMode(css, chroma.PreWrapper, style))) highlightIndex = 0 for index, tokens := range lines { @@ -288,7 +289,7 @@ func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma. highlightIndex++ } - if !(f.preventSurroundingPre || f.inlineCode) { + if !f.preventSurroundingPre && !f.inlineCode { // Start of Line fmt.Fprint(w, ``) // End of CodeLine fmt.Fprint(w, ``) // End of Line @@ -414,6 +415,26 @@ func (f *Formatter) styleAttr(styles map[chroma.TokenType]string, tt chroma.Toke return fmt.Sprintf(` style="%s"`, strings.Join(css, ";")) } +// modeClass returns the CSS class corresponding to the style's mode (eg. +// "light" or "dark"), with the formatter's class prefix applied. +func (f *Formatter) modeClass(style *chroma.Style) string { + return f.prefix + style.Mode().String() +} + +// styleAttrWithMode is like styleAttr but, in classes mode, appends the +// style's mode class alongside the existing class. Used for the outer +// wrapper and standalone so external CSS can target the mode. +func (f *Formatter) styleAttrWithMode(styles map[chroma.TokenType]string, tt chroma.TokenType, style *chroma.Style) string { + if !f.Classes { + return f.styleAttr(styles, tt) + } + cls := f.class(tt) + if cls == "" { + return "" + } + return fmt.Sprintf(` class="%s %s"`, cls, f.modeClass(style)) +} + func (f *Formatter) tabWidthStyle() string { if f.tabWidth != 0 && f.tabWidth != 8 { return fmt.Sprintf("-moz-tab-size: %[1]d; -o-tab-size: %[1]d; tab-size: %[1]d;", f.tabWidth) @@ -437,20 +458,32 @@ func (f *Formatter) writeCSSRule(w io.Writer, comment string, selector string, s } // WriteCSS writes CSS style definitions (without any surrounding HTML). +// +// Rules are scoped by the style's mode (eg. ".chroma.dark") so that CSS +// generated from a light and dark style can be combined without conflict. +// To support dynamic theme switching, call WriteCSS with both styles, +// concatenate the output, and toggle the wrapper's mode class (added +// automatically by Format) at runtime. Tokens that one theme leaves +// unstyled fall back to that theme's ".chroma." text/background +// via the CSS cascade; pass WithAllClasses(true) if you need every +// token's rule materialised explicitly for both themes. func (f *Formatter) WriteCSS(w io.Writer, style *chroma.Style) error { css := f.styleCache.get(style, false) + modeCls := f.modeClass(style) + chromaSel := fmt.Sprintf(".%schroma.%s", f.prefix, modeCls) + bgSel := fmt.Sprintf(".%sbg.%s", f.prefix, modeCls) // Special-case background as it is mapped to the outer ".chroma" class. - if err := f.writeCSSRule(w, chroma.Background.String(), fmt.Sprintf(".%sbg", f.prefix), css[chroma.Background]); err != nil { + if err := f.writeCSSRule(w, chroma.Background.String(), bgSel, css[chroma.Background]); err != nil { return err } // Special-case PreWrapper as it is the ".chroma" class. - if err := f.writeCSSRule(w, chroma.PreWrapper.String(), fmt.Sprintf(".%schroma", f.prefix), css[chroma.PreWrapper]); err != nil { + if err := f.writeCSSRule(w, chroma.PreWrapper.String(), chromaSel, css[chroma.PreWrapper]); err != nil { return err } // Special-case code column of table to expand width. if f.lineNumbers && f.lineNumbersInTable { - selector := fmt.Sprintf(".%schroma .%s:last-child", f.prefix, f.class(chroma.LineTableTD)) + selector := fmt.Sprintf("%s .%s:last-child", chromaSel, f.class(chroma.LineTableTD)) if err := f.writeCSSRule(w, chroma.LineTableTD.String(), selector, "width: 100%;"); err != nil { return err } @@ -460,7 +493,7 @@ func (f *Formatter) WriteCSS(w io.Writer, style *chroma.Style) error { targetedLineCSS := StyleEntryToCSS(style.Get(chroma.LineHighlight)) for _, tt := range []chroma.TokenType{chroma.LineNumbers, chroma.LineNumbersTable} { comment := fmt.Sprintf("%s targeted by URL anchor", tt) - selector := fmt.Sprintf(".%schroma .%s:target", f.prefix, f.class(tt)) + selector := fmt.Sprintf("%s .%s:target", chromaSel, f.class(tt)) if err := f.writeCSSRule(w, comment, selector, targetedLineCSS); err != nil { return err } @@ -481,7 +514,7 @@ func (f *Formatter) WriteCSS(w io.Writer, style *chroma.Style) error { if class == "" { continue } - if err := f.writeCSSRule(w, tt.String(), fmt.Sprintf(".%schroma .%s", f.prefix, class), css[tt]); err != nil { + if err := f.writeCSSRule(w, tt.String(), fmt.Sprintf("%s .%s", chromaSel, class), css[tt]); err != nil { return err } } @@ -613,8 +646,7 @@ func (l *styleCache) get(style *chroma.Style, compress bool) map[chroma.TokenTyp defer l.mu.Unlock() // Look for an existing entry. - for i := len(l.cache) - 1; i >= 0; i-- { - entry := l.cache[i] + for i, entry := range slices.Backward(l.cache) { if entry.style == style && entry.compressed == compress { // Top of the cache, no need to adjust the order. if i == len(l.cache)-1 { diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arturo.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arturo.xml new file mode 100644 index 000000000..541dc46e5 --- /dev/null +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arturo.xml @@ -0,0 +1,119 @@ + + + + Arturo + arturo + art + *.art + + + + + + + + + + + + + + + + + + + + + + + + + 3 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml index f1b454faf..4044f4914 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml @@ -81,7 +81,7 @@ - + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gemfile_lock.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gemfile_lock.xml new file mode 100644 index 000000000..83fc47b74 --- /dev/null +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gemfile_lock.xml @@ -0,0 +1,81 @@ + + + Gemfile.lock + gemfile-lock + gemfilelock + Gemfile.lock + *.gemfile.lock + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml index 3ce33ff6d..4ef5fd267 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml @@ -32,7 +32,7 @@ pattern="(assert|break|case|catch|continue|default|do|else|finally|for|if|goto|instanceof|new|return|switch|this|throw|try|while)\b"> - + @@ -44,7 +44,7 @@ + pattern="(abstract|const|enum|exports|extends|final|implements|native|non-sealed|open|opens|permits|private|protected|provides|public|requires|sealed|static|strictfp|super|synchronized|throws|to|transient|transitive|uses|volatile|with|yield)\b"> @@ -64,6 +64,10 @@ + + + + @@ -71,7 +75,7 @@ - + @@ -147,6 +151,15 @@ + + + + + + + + + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml index 0057aa1b6..f65d7103c 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml @@ -2,12 +2,15 @@ JSON json + jsonl *.json + *.jsonl *.jsonc *.json5 *.avsc .luaurc application/json + application/jsonl true true diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lilypond.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lilypond.xml new file mode 100644 index 000000000..fe4ac8ed3 --- /dev/null +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lilypond.xml @@ -0,0 +1,133 @@ + + + + LilyPond + lilypond + *.ly + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nu.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nu.xml index 326558086..82d4b3759 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nu.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nu.xml @@ -3,7 +3,12 @@ Nu nu *.nu + application/x-shellscript text/plain + text/x-shellscript + + + @@ -118,4 +123,4 @@ - + \ No newline at end of file diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml index 157d321f8..f8f0c8d79 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -46,9 +46,12 @@ - + + + + @@ -62,6 +65,9 @@ + + + @@ -69,7 +75,7 @@ - + @@ -115,4 +121,4 @@ - \ No newline at end of file + diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml index baa7e4359..15e96ba81 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml @@ -12,7 +12,11 @@ *.rbx *.duby Gemfile + *.gemfile Vagrantfile + Appraisals + .pryrc + *.json.jbuilder text/x-ruby application/x-ruby true diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/go.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/go.go index c6123b907..e6e04cca2 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/go.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/go.go @@ -30,8 +30,8 @@ func goRules() Rules { "root": { {`\n`, TextWhitespace, nil}, {`\s+`, TextWhitespace, nil}, - {`//[^\s][^\n\r]*`, CommentPreproc, nil}, - {`//\s+[^\n\r]*`, CommentSingle, nil}, + {`//[^\s\n\r][^\n\r]*`, CommentPreproc, nil}, + {`//[^\n\r]*`, CommentSingle, nil}, {`/(\\\n)?[*](.|\n)*?[*](\\\n)?/`, CommentMultiline, nil}, {`(import|package)\b`, KeywordNamespace, nil}, {`(var|func|struct|map|chan|type|interface|const)\b`, KeywordDeclaration, nil}, diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/http.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/http.go index b57cb1b84..fee74d3b6 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/http.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/http.go @@ -122,7 +122,7 @@ func (d *httpBodyContentTyper) Tokenise(options *TokeniseOptions, text string) ( if err != nil { panic(err) } - return EOF + return subIterator() } } } diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go index bcd5b1784..eed2cb7e5 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go @@ -1,11 +1,13 @@ package lexers import ( + "strings" + . "github.com/alecthomas/chroma/v2" // nolint ) -// Markdown lexer. -var Markdown = Register(MustNewLexer( +// Markdown lexer with YAML frontmatter and HTML comment support. +var Markdown = Register(&markdownLexer{Lexer: MustNewLexer( &Config{ Name: "markdown", Aliases: []string{"md", "mkd"}, @@ -13,11 +15,69 @@ var Markdown = Register(MustNewLexer( MimeTypes: []string{"text/x-markdown"}, }, markdownRules, -)) +)}) + +// markdownLexer wraps the base Markdown lexer to highlight top-of-file YAML frontmatter. +type markdownLexer struct { + Lexer +} + +// Lexes Markdown, highlighting a leading YAML frontmatter block before delegating to Markdown rules. +func (m *markdownLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { + frontmatter, rest, ok := splitFrontmatter(text) + if !ok { + return m.Lexer.Tokenise(options, text) + } + + yamlLexer := Get("YAML") + if yamlLexer == nil { + return m.Lexer.Tokenise(options, text) + } + + yamlTokens, err := yamlLexer.Tokenise(options, frontmatter) + if err != nil { + return nil, err + } + markdownTokens, err := m.Lexer.Tokenise(options, rest) + if err != nil { + return nil, err + } + return Concaterator(yamlTokens, markdownTokens), nil +} + +// Extracts a leading YAML frontmatter block if the document starts with one. +func splitFrontmatter(text string) (frontmatter string, rest string, ok bool) { + if !strings.HasPrefix(text, "---\n") && !strings.HasPrefix(text, "---\r\n") { + return "", text, false + } + + lineEnd := strings.IndexByte(text, '\n') + if lineEnd < 0 { + return "", text, false + } + if strings.TrimSuffix(text[:lineEnd], "\r") != "---" { + return "", text, false + } + + for pos := lineEnd + 1; pos < len(text); { + next := strings.IndexByte(text[pos:], '\n') + if next < 0 { + break + } + lineEnd = pos + next + line := strings.TrimSuffix(text[pos:lineEnd], "\r") + if line == "---" { + return text[:lineEnd+1], text[lineEnd+1:], true + } + pos = lineEnd + 1 + } + return "", text, false +} func markdownRules() Rules { return Rules{ "root": { + {``, CommentMultiline, nil}, {`^(#[^#].+\n)`, ByGroups(GenericHeading), nil}, {`^(#{2,6}.+\n)`, ByGroups(GenericSubheading), nil}, {`^(\s*)([*-] )(\[[ xX]\])( .+\n)`, ByGroups(Text, Keyword, Keyword, UsingSelf("inline")), nil}, @@ -33,6 +93,7 @@ func markdownRules() Rules { Include("inline"), }, "inline": { + {``, CommentMultiline, nil}, {`\\.`, Text, nil}, {`(\s)(\*|_)((?:(?!\2).)*)(\2)((?=\W|\n))`, ByGroups(Text, GenericEmph, GenericEmph, GenericEmph, Text), nil}, {`(\s)((\*\*|__).*?)\3((?=\W|\n))`, ByGroups(Text, GenericStrong, GenericStrong, Text), nil}, diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markless.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markless.go index 508513d78..437590e9b 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markless.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/markless.go @@ -70,14 +70,14 @@ func marklessRules() Rules { {`(! )([^ ]+)(.+?)$`, ByGroups(Keyword, NameFunction, NameVariable), nil}, }, "embed": { - {`(\[ )([^ ]+)( )([^,]+)`, ByGroups(Keyword, NameFunction, TextWhitespace, String), Push("embed-options")}, + {`(\[ )([^ ]+)( )([^,\]\n]+)`, ByGroups(Keyword, NameFunction, TextWhitespace, String), Push("embed-options")}, }, "embed-options": { {`\\.`, Text, nil}, {`,`, Punctuation, nil}, {`\]?$`, Keyword, Pop(1)}, // Generic key or key/value pair - {`( *)([^, \]]+)([^,\]]+)?`, ByGroups(TextWhitespace, NameFunction, String), nil}, + {`( *)([^, \]\n]+)([^,\]\n]+)?`, ByGroups(TextWhitespace, NameFunction, String), nil}, {`.`, Text, nil}, }, "footnote": { diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/raku.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/raku.go index da354dce6..38d8fe8a9 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/raku.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/raku.go @@ -6,7 +6,7 @@ import ( "strings" "unicode/utf8" - "github.com/dlclark/regexp2" + "github.com/dlclark/regexp2/v2" . "github.com/alecthomas/chroma/v2" // nolint ) @@ -458,8 +458,7 @@ func rakuRules() Rules { var podRegex *regexp2.Regexp if tokenClass == rakuPod { podRegex = regexp2.MustCompile( - state.NamedGroups[`ws`]+`=end`+`\s+`+regexp2.Escape(state.NamedGroups[`name`]), - 0, + state.NamedGroups[`ws`] + `=end` + `\s+` + regexp2.Escape(state.NamedGroups[`name`]), ) } else { closingChars = []rune(strings.Repeat(string(closingChar), nChars)) @@ -478,7 +477,7 @@ func rakuRules() Rules { match, err := podRegex.FindRunesMatchStartingAt(text, searchPos+nChars) if err == nil { closingChars = match.Runes() - nextClosePos = match.Index + nextClosePos = match.RuneIndex } else { nextClosePos = -1 } @@ -1599,8 +1598,7 @@ func quote(groups []string, state *LexerState) Iterator { var tokenStates []string // Set tokenStates based on adverbs - adverbs := strings.Split(adverbsStr, ":") - for _, adverb := range adverbs { + for adverb := range strings.SplitSeq(adverbsStr, ":") { switch adverb { case "c", "closure": tokenStates = append(tokenStates, "Q-closure") diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/lexers/yaml_jinja.go b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/yaml_jinja.go new file mode 100644 index 000000000..6df1911e4 --- /dev/null +++ b/tools/vendor/github.com/alecthomas/chroma/v2/lexers/yaml_jinja.go @@ -0,0 +1,20 @@ +package lexers + +import ( + . "github.com/alecthomas/chroma/v2" // nolint +) + +// YAML+Jinja is YAML with Jinja templating embedded. Used by Ansible playbooks +// and Salt SLS files. +var YAMLJinja = Register(DelegatingLexer( + MustNewXMLLexer(embedded, "embedded/yaml.xml"), + MustNewXMLLexer(embedded, "embedded/django_jinja.xml").SetConfig( + &Config{ + Name: "YAML+Jinja", + Aliases: []string{"yaml+jinja", "salt", "sls", "ansible"}, + Filenames: []string{"*.sls"}, + MimeTypes: []string{"text/x-yaml+jinja", "text/x-sls"}, + DotAll: true, + }, + ), +)) diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/regexp.go b/tools/vendor/github.com/alecthomas/chroma/v2/regexp.go index d183fa5dc..2c494061c 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/regexp.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/regexp.go @@ -3,6 +3,7 @@ package chroma import ( "encoding/json" "fmt" + "maps" "os" "path/filepath" "regexp" @@ -12,7 +13,7 @@ import ( "time" "unicode/utf8" - "github.com/dlclark/regexp2" + "github.com/dlclark/regexp2/v2" ) // A Rule is the fundamental matching unit of the Regex lexer state machine. @@ -70,9 +71,7 @@ func (r Rules) Clone() Rules { // Merge creates a clone of "r" then merges "rules" into the clone. func (r Rules) Merge(rules Rules) Rules { out := r.Clone() - for k, v := range rules.Clone() { - out[k] = v - } + maps.Copy(out, rules.Clone()) return out } @@ -177,19 +176,19 @@ type LexerState struct { // Named Group matches. NamedGroups map[string]string // Custum context for mutators. - MutatorContext map[interface{}]interface{} + MutatorContext map[any]any iteratorStack []Iterator options *TokeniseOptions newlineAdded bool } // Set mutator context. -func (l *LexerState) Set(key interface{}, value interface{}) { +func (l *LexerState) Set(key any, value any) { l.MutatorContext[key] = value } // Get mutator context. -func (l *LexerState) Get(key interface{}) interface{} { +func (l *LexerState) Get(key any) any { return l.MutatorContext[key] } @@ -369,7 +368,7 @@ func (r *RegexLexer) maybeCompile() (err error) { pattern = "(?" + rule.flags + ")" + pattern } pattern = `\G` + pattern - rule.Regexp, err = regexp2.Compile(pattern, 0) + rule.Regexp, err = regexp2.Compile(pattern) if err != nil { return fmt.Errorf("failed to compile rule %s.%d: %s", state, i, err) } @@ -484,7 +483,7 @@ func (r *RegexLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, Text: []rune(text), Stack: []string{options.State}, Rules: r.rules, - MutatorContext: map[interface{}]interface{}{}, + MutatorContext: map[any]any{}, } return state.Iterator, nil } @@ -501,7 +500,7 @@ func (r *RegexLexer) MustRules() Rules { func matchRules(text []rune, pos int, rules []*CompiledRule) (int, *CompiledRule, []string, map[string]string) { for i, rule := range rules { match, err := rule.Regexp.FindRunesMatchStartingAt(text, pos) - if match != nil && err == nil && match.Index == pos { + if match != nil && err == nil && match.RuneIndex == pos { groups := []string{} namedGroups := make(map[string]string) for _, g := range match.Groups() { diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/serialise.go b/tools/vendor/github.com/alecthomas/chroma/v2/serialise.go index 3d7f6c5d5..dacf69c5d 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/serialise.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/serialise.go @@ -13,7 +13,7 @@ import ( "regexp" "strings" - "github.com/dlclark/regexp2" + "github.com/dlclark/regexp2/v2" ) // Serialisation of Chroma rules to XML. The format is: @@ -440,14 +440,14 @@ func (t TokenType) MarshalXML(e *xml.Encoder, start xml.StartElement) error { } // This hijinks is a bit unfortunate but without it we can't deserialise into TokenType. -func newFromTemplate(template interface{}) (value func() interface{}, target interface{}) { +func newFromTemplate(template any) (value func() any, target any) { t := reflect.TypeOf(template) - if t.Kind() == reflect.Ptr { + if t.Kind() == reflect.Pointer { v := reflect.New(t.Elem()) return v.Interface, v.Interface() } v := reflect.New(t) - return func() interface{} { return v.Elem().Interface() }, v.Interface() + return func() any { return v.Elem().Interface() }, v.Interface() } func (b *Emitters) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/style.go b/tools/vendor/github.com/alecthomas/chroma/v2/style.go index cc8d9a602..36989ad35 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/style.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/style.go @@ -4,7 +4,8 @@ import ( "encoding/xml" "fmt" "io" - "sort" + "maps" + "slices" "strings" ) @@ -18,6 +19,24 @@ const ( No ) +// Mode indicates whether a style is intended for a light or dark background. +type Mode uint8 + +// Mode values. +const ( + Light Mode = iota + Dark +) + +func (m Mode) String() string { + switch m { + case Dark: + return "dark" + default: + return "light" + } +} + func (t Trilean) String() string { switch t { case Yes: @@ -31,12 +50,14 @@ func (t Trilean) String() string { // Prefix returns s with "no" as a prefix if Trilean is no. func (t Trilean) Prefix(s string) string { - if t == Yes { + switch t { + case Yes: return s - } else if t == No { + case No: return "no" + s + default: + return "" } - return "" } // A StyleEntry in the Style map. @@ -111,11 +132,10 @@ func (s StyleEntry) Sub(e StyleEntry) StyleEntry { // Ancestors should be provided from oldest to newest. func (s StyleEntry) Inherit(ancestors ...StyleEntry) StyleEntry { out := s - for i := len(ancestors) - 1; i >= 0; i-- { + for _, ancestor := range slices.Backward(ancestors) { if out.NoInherit { return out } - ancestor := ancestors[i] if !out.Colour.IsSet() { out.Colour = ancestor.Colour } @@ -147,19 +167,24 @@ func (s StyleEntry) IsZero() bool { // // Once built, a Style is immutable. type StyleBuilder struct { - entries map[TokenType]string - name string - parent *Style + entries map[TokenType]string + name string + counterpart string + parent *Style } func NewStyleBuilder(name string) *StyleBuilder { return &StyleBuilder{name: name, entries: map[TokenType]string{}} } +// Counterpart sets the lowercase name of the opposite-mode style. +func (s *StyleBuilder) Counterpart(name string) *StyleBuilder { + s.counterpart = strings.ToLower(name) + return s +} + func (s *StyleBuilder) AddAll(entries StyleEntries) *StyleBuilder { - for ttype, entry := range entries { - s.entries[ttype] = entry - } + maps.Copy(s.entries, entries) return s } @@ -205,10 +230,15 @@ func (s *StyleBuilder) Transform(transform func(StyleEntry) StyleEntry) *StyleBu } func (s *StyleBuilder) Build() (*Style, error) { + counterpart := s.counterpart + if counterpart == "" && s.parent != nil { + counterpart = s.parent.Counterpart + } style := &Style{ - Name: s.name, - entries: map[TokenType]StyleEntry{}, - parent: s.parent, + Name: s.name, + Counterpart: counterpart, + entries: map[TokenType]StyleEntry{}, + parent: s.parent, } for ttype, descriptor := range s.entries { entry, err := ParseStyleEntry(descriptor) @@ -257,9 +287,23 @@ func MustNewStyle(name string, entries StyleEntries) *Style { // // See http://pygments.org/docs/styles/ for details. Semantics are intended to be identical. type Style struct { - Name string - entries map[TokenType]StyleEntry - parent *Style + Name string + // Counterpart is the lowercase name of the style intended as this style's + // opposite-mode pair (eg. "github-dark" for "github"). Resolved via + // styles.GetForMode. May be empty. + Counterpart string + entries map[TokenType]StyleEntry + parent *Style +} + +// Mode returns Light or Dark based on the brightness of the Background entry's +// background colour. Styles with an unset Background default to Light. +func (s *Style) Mode() Mode { + bg := s.get(Background).Background + if bg.IsSet() && bg.Brightness() < 0.5 { + return Dark + } + return Light } func (s *Style) MarshalXML(e *xml.Encoder, start xml.StartElement) error { @@ -268,6 +312,9 @@ func (s *Style) MarshalXML(e *xml.Encoder, start xml.StartElement) error { } start.Name = xml.Name{Local: "style"} start.Attr = []xml.Attr{{Name: xml.Name{Local: "name"}, Value: s.Name}} + if s.Counterpart != "" { + start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Local: "counterpart"}, Value: s.Counterpart}) + } if err := e.EncodeToken(start); err != nil { return err } @@ -275,7 +322,7 @@ func (s *Style) MarshalXML(e *xml.Encoder, start xml.StartElement) error { for ttype := range s.entries { sorted = append(sorted, ttype) } - sort.Slice(sorted, func(i, j int) bool { return sorted[i] < sorted[j] }) + slices.Sort(sorted) for _, ttype := range sorted { entry := s.entries[ttype] el := xml.StartElement{Name: xml.Name{Local: "entry"}} @@ -295,9 +342,12 @@ func (s *Style) MarshalXML(e *xml.Encoder, start xml.StartElement) error { func (s *Style) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { for _, attr := range start.Attr { - if attr.Name.Local == "name" { + switch attr.Name.Local { + case "name": s.Name = attr.Value - } else { + case "counterpart": + s.Counterpart = strings.ToLower(attr.Value) + default: return fmt.Errorf("unexpected attribute %s", attr.Name.Local) } } @@ -437,8 +487,7 @@ func MustParseStyleEntry(entry string) StyleEntry { // ParseStyleEntry parses a Pygments style entry. func ParseStyleEntry(entry string) (StyleEntry, error) { // nolint: gocyclo out := StyleEntry{} - parts := strings.Fields(entry) - for _, part := range parts { + for part := range strings.FieldsSeq(entry) { switch { case part == "italic": out.Italic = Yes diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/styles/api.go b/tools/vendor/github.com/alecthomas/chroma/v2/styles/api.go index 9e21c8844..43fa26dd0 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/styles/api.go +++ b/tools/vendor/github.com/alecthomas/chroma/v2/styles/api.go @@ -64,3 +64,32 @@ func Get(name string) *chroma.Style { } return Fallback } + +// GetForMode returns the named style if it already matches mode, otherwise its +// registered counterpart if one exists and matches mode. If neither matches, +// the originally-requested style is returned (or Fallback if the name is +// unknown), so callers always get something usable. +func GetForMode(name string, mode chroma.Mode) *chroma.Style { + style := Get(name) + if style.Mode() == mode { + return style + } + if style.Counterpart == "" { + return style + } + counterpart, ok := Registry[style.Counterpart] + if !ok || counterpart.Mode() != mode { + return style + } + return counterpart +} + +// RegisterPair links two styles as light/dark counterparts of each other. +// +// Both styles are also registered if they are not already present. +func RegisterPair(a, b *chroma.Style) { + Register(a) + Register(b) + a.Counterpart = strings.ToLower(b.Name) + b.Counterpart = strings.ToLower(a.Name) +} diff --git a/tools/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml b/tools/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml index c87c8765d..a6e41ab88 100644 --- a/tools/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml +++ b/tools/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml @@ -1,4 +1,4 @@ -