diff --git a/go.mod b/go.mod index 608b35b..200eade 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,15 @@ module github.com/ONSdigital/dp-cli go 1.24 require ( - github.com/ONSdigital/log.go/v2 v2.4.5 - github.com/aws/aws-sdk-go v1.55.6 + github.com/ONSdigital/log.go/v2 v2.4.6 + github.com/aws/aws-sdk-go v1.55.7 github.com/fatih/color v1.18.0 github.com/google/go-github/v66 v66.0.0 github.com/johnnadratowski/golang-neo4j-bolt-driver v0.0.0-20200323142034-807201386efa github.com/pkg/errors v0.9.1 github.com/smartystreets/goconvey v1.8.1 github.com/spf13/cobra v1.9.1 - golang.org/x/oauth2 v0.28.0 + golang.org/x/oauth2 v0.30.0 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 gopkg.in/yaml.v2 v2.4.0 ) @@ -35,5 +35,5 @@ require ( go.opentelemetry.io/otel v1.35.0 // indirect go.opentelemetry.io/otel/metric v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect - golang.org/x/sys v0.33.0 // indirect + golang.org/x/sys v0.34.0 // indirect ) diff --git a/go.sum b/go.sum index 4d6f792..9f54d5c 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,10 @@ github.com/ONSdigital/dp-api-clients-go/v2 v2.266.0 h1:NQbu+x2Q7ZhrjGKvN73qVxG/n github.com/ONSdigital/dp-api-clients-go/v2 v2.266.0/go.mod h1:bLseTP21r8LCStUEeOdVPyqtrTomOFP/azPjKWW4deA= github.com/ONSdigital/dp-net/v3 v3.3.0 h1:NAH9z+nvbJxoK6OnDpOyJJ+52dqBhVtaugk5bqEDt0Y= github.com/ONSdigital/dp-net/v3 v3.3.0/go.mod h1:ur4LLCvd2xW2jpa785pElE6HB2bPvszZxdAjqv0XFGg= -github.com/ONSdigital/log.go/v2 v2.4.5 h1:LclSJUNHgbhgl386daHXNX9j3LOwXd/AeuiSSfEuclM= -github.com/ONSdigital/log.go/v2 v2.4.5/go.mod h1:qaWY2DOgD/hIzas3m76WPye1HrrS3RLXQC7erxVL36Y= -github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= -github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/ONSdigital/log.go/v2 v2.4.6 h1:GgJOFLQvGiZmVjsHDD91xgovSCtHf0UIdJmlRCzp/pE= +github.com/ONSdigital/log.go/v2 v2.4.6/go.mod h1:0ilpZzc5lVoBlXC/s5m8EaQETbe0yT8Z+p4QhKy0fpY= +github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE= +github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -72,11 +72,11 @@ go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/ go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= -golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc= -golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= +golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/project_generation/content/templates/base-app/nomad.tmpl b/project_generation/content/templates/base-app/nomad.tmpl index 706649b..4be9fe1 100644 --- a/project_generation/content/templates/base-app/nomad.tmpl +++ b/project_generation/content/templates/base-app/nomad.tmpl @@ -14,6 +14,17 @@ job "{{.Name}}" { group "web" { count = "{{"{{"}}WEB_TASK_COUNT{{"}}"}}" + spread { + attribute = "${node.unique.id}" + weight = 100 + # with `target` omitted, Nomad will spread allocations evenly across all values of the attribute. + } + spread { + attribute = "${attr.platform.aws.placement.availability-zone}" + weight = 100 + # with `target` omitted, Nomad will spread allocations evenly across all values of the attribute. + } + constraint { attribute = "${node.class}" value = "web" @@ -78,6 +89,17 @@ job "{{.Name}}" { group "publishing" { count = "{{"{{"}}PUBLISHING_TASK_COUNT{{"}}"}}" + spread { + attribute = "${node.unique.id}" + weight = 100 + # with `target` omitted, Nomad will spread allocations evenly across all values of the attribute. + } + spread { + attribute = "${attr.platform.aws.placement.availability-zone}" + weight = 100 + # with `target` omitted, Nomad will spread allocations evenly across all values of the attribute. + } + constraint { attribute = "${node.class}" value = "publishing"