Skip to content

Commit 36f094f

Browse files
authored
B/fix module update (#327)
1 parent f69e150 commit 36f094f

8 files changed

Lines changed: 268 additions & 263 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 0.0.155 (Jan 07, 2026)
2+
* Fixed an issue where `nullstone apply` failed if `--module-version` was specified.
3+
14
# 0.0.154 (Jan 07, 2026)
25
* Fixed initial deployments of Cloud Run apps.
36

cmd/apply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var Apply = func() *cli.Command {
5050

5151
return BlockWorkspaceAction(c, func(ctx context.Context, cfg api.Config, stack types.Stack, block types.Block, env types.Environment, workspace types.Workspace) error {
5252
if moduleVersion != "" {
53-
module := types.WorkspaceModuleInput{
53+
module := api.UpdateWorkspaceModuleInput{
5454
Module: block.ModuleSource,
5555
ModuleVersion: moduleVersion,
5656
}

cmd/perform_run.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import (
44
"context"
55
"errors"
66
"fmt"
7+
"os"
8+
"time"
9+
710
"gopkg.in/nullstone-io/go-api-client.v0"
811
api_runs "gopkg.in/nullstone-io/go-api-client.v0/runs"
912
"gopkg.in/nullstone-io/go-api-client.v0/types"
1013
"gopkg.in/nullstone-io/nullstone.v0/app_urls"
1114
"gopkg.in/nullstone-io/nullstone.v0/runs"
12-
"os"
1315
)
1416

1517
type PerformRunInput struct {
@@ -22,7 +24,7 @@ type PerformRunInput struct {
2224
}
2325

2426
func PerformRun(ctx context.Context, cfg api.Config, input PerformRunInput) error {
25-
result, err := api_runs.Create(ctx, cfg, input.Workspace, input.CommitSha, input.IsApproved, input.IsDestroy, "")
27+
result, err := api_runs.Create(ctx, cfg, input.Workspace, input.CommitSha, input.IsApproved, time.Now(), input.IsDestroy, "")
2628
if err != nil {
2729
return fmt.Errorf("error creating run: %w", err)
2830
} else if result == nil {

cmd/plan.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package cmd
22

33
import (
44
"context"
5+
56
"github.com/urfave/cli/v2"
67
"gopkg.in/nullstone-io/go-api-client.v0"
78
"gopkg.in/nullstone-io/go-api-client.v0/types"
@@ -38,7 +39,7 @@ var Plan = func() *cli.Command {
3839

3940
return BlockWorkspaceAction(c, func(ctx context.Context, cfg api.Config, stack types.Stack, block types.Block, env types.Environment, workspace types.Workspace) error {
4041
if moduleVersion != "" {
41-
module := types.WorkspaceModuleInput{
42+
module := api.UpdateWorkspaceModuleInput{
4243
Module: block.ModuleSource,
4344
ModuleVersion: moduleVersion,
4445
}

go.mod

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
module gopkg.in/nullstone-io/nullstone.v0
22

3-
go 1.24.0
3+
go 1.25.0
44

55
require (
6-
cloud.google.com/go/run v1.10.0
7-
github.com/aws/aws-sdk-go-v2 v1.39.0
8-
github.com/aws/aws-sdk-go-v2/service/ecs v1.64.0
9-
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.3
10-
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.50.2
6+
cloud.google.com/go/run v1.13.0
7+
github.com/aws/aws-sdk-go-v2 v1.41.0
8+
github.com/aws/aws-sdk-go-v2/service/ecs v1.70.0
9+
github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.33.18
10+
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.54.5
1111
github.com/cristalhq/jwt/v3 v3.1.0
1212
github.com/go-git/go-git/v5 v5.16.2
1313
github.com/gosuri/uilive v0.0.4
1414
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
15-
github.com/nullstone-io/deployment-sdk v0.0.0-20260107164755-69ecc30f12e0
16-
github.com/nullstone-io/iac v0.0.0-20251022110736-dc1cb12c5af7
15+
github.com/nullstone-io/deployment-sdk v0.0.0-20260107212030-7fcae27ebb27
16+
github.com/nullstone-io/iac v0.0.0-20260107210755-6abbd01ce754
1717
github.com/nullstone-io/module v0.2.10
1818
github.com/ryanuber/columnize v2.1.2+incompatible
1919
github.com/stretchr/testify v1.11.1
2020
github.com/urfave/cli/v2 v2.27.7
2121
golang.org/x/crypto v0.46.0
2222
golang.org/x/sync v0.19.0
23-
gopkg.in/nullstone-io/go-api-client.v0 v0.0.0-20251209224316-3f2fb93be0ec
24-
k8s.io/api v0.34.0
25-
k8s.io/apimachinery v0.34.0
26-
k8s.io/client-go v0.34.0
27-
k8s.io/kubectl v0.32.1
23+
gopkg.in/nullstone-io/go-api-client.v0 v0.0.0-20260107214534-4f7a81b680ec
24+
k8s.io/api v0.35.0
25+
k8s.io/apimachinery v0.35.0
26+
k8s.io/client-go v0.35.0
27+
k8s.io/kubectl v0.35.0
2828
)
2929

3030
require (
@@ -33,9 +33,9 @@ require (
3333
github.com/ProtonMail/go-crypto v1.3.0 // indirect
3434
github.com/agext/levenshtein v1.2.3 // indirect
3535
github.com/aws/aws-sdk-go-v2/service/ec2 v1.252.0
36-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.1 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.7 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.16 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.16 // indirect
3939
github.com/aws/aws-sdk-go-v2/service/ssm v1.44.7
4040
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
4141
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/tmccombs/hcl2json v0.6.0 // indirect
5858
github.com/xanzy/ssh-agent v0.3.3 // indirect
5959
github.com/zclconf/go-cty v1.14.1 // indirect
60-
golang.org/x/mod v0.30.0
60+
golang.org/x/mod v0.31.0
6161
golang.org/x/net v0.48.0 // indirect
6262
golang.org/x/sys v0.39.0 // indirect
6363
golang.org/x/term v0.38.0 // indirect
@@ -68,39 +68,39 @@ require (
6868

6969
require (
7070
cel.dev/expr v0.24.0 // indirect
71-
cloud.google.com/go v0.121.0 // indirect
72-
cloud.google.com/go/auth v0.17.0 // indirect
71+
cloud.google.com/go v0.123.0 // indirect
72+
cloud.google.com/go/auth v0.18.0 // indirect
7373
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
74-
cloud.google.com/go/compute v1.38.0 // indirect
74+
cloud.google.com/go/compute v1.52.0 // indirect
7575
cloud.google.com/go/compute/metadata v0.9.0 // indirect
76-
cloud.google.com/go/functions v1.19.6 // indirect
77-
cloud.google.com/go/iam v1.5.2 // indirect
78-
cloud.google.com/go/logging v1.13.0 // indirect
79-
cloud.google.com/go/longrunning v0.6.7 // indirect
80-
cloud.google.com/go/monitoring v1.24.2 // indirect
81-
cloud.google.com/go/storage v1.52.0 // indirect
76+
cloud.google.com/go/functions v1.19.7 // indirect
77+
cloud.google.com/go/iam v1.5.3 // indirect
78+
cloud.google.com/go/logging v1.13.1 // indirect
79+
cloud.google.com/go/longrunning v0.7.0 // indirect
80+
cloud.google.com/go/monitoring v1.24.3 // indirect
81+
cloud.google.com/go/storage v1.58.0 // indirect
8282
dario.cat/mergo v1.0.2 // indirect
8383
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
8484
github.com/BSick7/go-api v0.18.3 // indirect
8585
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
86-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
87-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
86+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.54.0 // indirect
87+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
8888
github.com/MakeNowJust/heredoc v1.0.0 // indirect
8989
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
90-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
91-
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
92-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.13 // indirect
93-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.7 // indirect
94-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.7 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
96-
github.com/aws/aws-sdk-go-v2/service/batch v1.35.1 // indirect
97-
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.31.0 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
101-
github.com/aws/aws-sdk-go-v2/service/lambda v1.49.7 // indirect
102-
github.com/aws/aws-sdk-go-v2/service/s3 v1.48.0 // indirect
103-
github.com/aws/smithy-go v1.23.0 // indirect
90+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
91+
github.com/aws/aws-sdk-go-v2/credentials v1.19.6 // indirect
92+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.20.18 // indirect
93+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.16 // indirect
94+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.16 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.16 // indirect
96+
github.com/aws/aws-sdk-go-v2/service/batch v1.58.11 // indirect
97+
github.com/aws/aws-sdk-go-v2/service/cloudfront v1.58.3 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.63.0 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/ecr v1.55.0 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.7 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/lambda v1.87.0 // indirect
102+
github.com/aws/aws-sdk-go-v2/service/s3 v1.95.0 // indirect
103+
github.com/aws/smithy-go v1.24.0 // indirect
104104
github.com/blang/semver/v4 v4.0.0 // indirect
105105
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
106106
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -122,7 +122,7 @@ require (
122122
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
123123
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
124124
github.com/fatih/camelcase v1.0.0 // indirect
125-
github.com/fatih/color v1.13.0 // indirect
125+
github.com/fatih/color v1.18.0 // indirect
126126
github.com/felixge/httpsnoop v1.0.4 // indirect
127127
github.com/fvbommel/sortorder v1.0.2 // indirect
128128
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
@@ -133,15 +133,13 @@ require (
133133
github.com/go-openapi/jsonpointer v0.21.0 // indirect
134134
github.com/go-openapi/jsonreference v0.20.2 // indirect
135135
github.com/go-openapi/swag v0.23.0 // indirect
136-
github.com/gogo/protobuf v1.3.2 // indirect
137136
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
138137
github.com/google/btree v1.1.3 // indirect
139138
github.com/google/gnostic-models v0.7.0 // indirect
140139
github.com/google/go-cmp v0.7.0 // indirect
141140
github.com/google/s2a-go v0.1.9 // indirect
142-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
143141
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
144-
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
142+
github.com/googleapis/gax-go/v2 v2.16.0 // indirect
145143
github.com/gorilla/mux v1.8.1 // indirect
146144
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
147145
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
@@ -173,13 +171,12 @@ require (
173171
github.com/opencontainers/image-spec v1.1.1 // indirect
174172
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
175173
github.com/pjbgf/sha1cd v0.5.0 // indirect
176-
github.com/pkg/errors v0.9.1 // indirect
177174
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
178175
github.com/sethvargo/go-retry v0.3.0 // indirect
179176
github.com/sirupsen/logrus v1.9.3 // indirect
180177
github.com/skeema/knownhosts v1.3.1 // indirect
181-
github.com/spf13/cobra v1.8.1 // indirect
182-
github.com/spf13/pflag v1.0.6 // indirect
178+
github.com/spf13/cobra v1.10.0 // indirect
179+
github.com/spf13/pflag v1.0.10 // indirect
183180
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
184181
github.com/stretchr/objx v0.5.2 // indirect
185182
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
@@ -189,37 +186,38 @@ require (
189186
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
190187
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
191188
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
192-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
193-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
189+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
190+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0 // indirect
194191
go.opentelemetry.io/otel v1.39.0 // indirect
195192
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
196193
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
197-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
194+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
198195
go.opentelemetry.io/otel/metric v1.39.0 // indirect
199-
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
200-
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
196+
go.opentelemetry.io/otel/sdk v1.39.0 // indirect
197+
go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
201198
go.opentelemetry.io/otel/trace v1.39.0 // indirect
202199
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
203-
go.yaml.in/yaml/v2 v2.4.2 // indirect
200+
go.yaml.in/yaml/v2 v2.4.3 // indirect
204201
go.yaml.in/yaml/v3 v3.0.4 // indirect
205202
golang.org/x/oauth2 v0.34.0 // indirect
206203
golang.org/x/time v0.14.0 // indirect
207-
google.golang.org/api v0.258.0 // indirect
208-
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
209-
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
210-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
211-
google.golang.org/grpc v1.77.0 // indirect
204+
google.golang.org/api v0.259.0 // indirect
205+
google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect
206+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
207+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
208+
google.golang.org/grpc v1.78.0 // indirect
212209
google.golang.org/protobuf v1.36.11 // indirect
213-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
210+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
214211
gopkg.in/inf.v0 v0.9.1 // indirect
215-
k8s.io/cli-runtime v0.32.1 // indirect
216-
k8s.io/component-base v0.32.1 // indirect
212+
k8s.io/cli-runtime v0.35.0 // indirect
213+
k8s.io/component-base v0.35.0 // indirect
214+
k8s.io/component-helpers v0.35.0 // indirect
217215
k8s.io/klog/v2 v2.130.1 // indirect
218-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
219-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
220-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
221-
sigs.k8s.io/kustomize/api v0.18.0 // indirect
222-
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
216+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
217+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
218+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
219+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
220+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
223221
sigs.k8s.io/randfill v1.0.0 // indirect
224222
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
225223
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)