Skip to content

Commit 4618271

Browse files
SimonRichardsonSimonRichardson
committed
Ensure import stantzas
1 parent 38b5832 commit 4618271

File tree

104 files changed

+147
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+147
-160
lines changed

‎api/agent/provisioner/provisioner_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/golang/mock/gomock"
1111
"github.com/juju/errors"
12-
"github.com/juju/juju/core/arch"
1312
"github.com/juju/names/v4"
1413
jc "github.com/juju/testing/checkers"
1514
"github.com/juju/utils/v3"
@@ -21,6 +20,7 @@ import (
2120
apitesting "github.com/juju/juju/api/testing"
2221
apiservererrors "github.com/juju/juju/apiserver/errors"
2322
"github.com/juju/juju/container"
23+
"github.com/juju/juju/core/arch"
2424
"github.com/juju/juju/core/constraints"
2525
"github.com/juju/juju/core/instance"
2626
"github.com/juju/juju/core/life"

‎apiserver/common/tools_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88

99
"github.com/golang/mock/gomock"
1010
"github.com/juju/errors"
11-
"github.com/juju/juju/core/arch"
1211
"github.com/juju/names/v4"
1312
jujutesting "github.com/juju/testing"
1413
jc "github.com/juju/testing/checkers"
@@ -18,6 +17,7 @@ import (
1817
"github.com/juju/juju/apiserver/common"
1918
"github.com/juju/juju/apiserver/common/mocks"
2019
apiservertesting "github.com/juju/juju/apiserver/testing"
20+
"github.com/juju/juju/core/arch"
2121
"github.com/juju/juju/core/network"
2222
coreos "github.com/juju/juju/core/os"
2323
"github.com/juju/juju/environs"

‎apiserver/facades/client/application/deployrepository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ func (v *deployFromRepositoryValidator) resolveCharm(curl *charm.URL, requestedO
531531
// default arch, it means use any arch which isn't quite the same. So if we
532532
// do get "all" we should see if there is a clean way to resolve it.
533533
if resolvedOrigin.Platform.Architecture == "all" {
534-
resolvedOrigin.Platform.Architecture = constraints.ConstraintArch(modelCons, nil)
534+
resolvedOrigin.Platform.Architecture = constraints.ArchOrDefault(modelCons, nil)
535535
}
536536

537537
var seriesFlag string

‎apiserver/facades/client/charms/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func (a *API) getDefaultArch() (string, error) {
215215
if err != nil {
216216
return "", errors.Trace(err)
217217
}
218-
return constraints.ConstraintArch(cons, nil), nil
218+
return constraints.ArchOrDefault(cons, nil), nil
219219
}
220220

221221
func normalizeCharmOrigin(origin params.CharmOrigin, fallbackArch string) (params.CharmOrigin, error) {
@@ -410,7 +410,7 @@ func (a *API) resolveOneCharm(arg params.ResolveCharmWithChannel) params.Resolve
410410
result.Error = apiservererrors.ServerError(err)
411411
return result
412412
}
413-
archOrigin.Architecture = constraints.ConstraintArch(cons, nil)
413+
archOrigin.Architecture = constraints.ArchOrDefault(cons, nil)
414414
}
415415

416416
result.Origin = archOrigin

‎caas/kubernetes/provider/application/constraints.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"strings"
1010

1111
"github.com/juju/errors"
12-
"github.com/juju/juju/core/arch"
1312
core "k8s.io/api/core/v1"
1413
"k8s.io/apimachinery/pkg/api/resource"
1514
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1615

16+
"github.com/juju/juju/core/arch"
1717
"github.com/juju/juju/core/constraints"
1818
)
1919

‎caas/kubernetes/provider/k8s.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
jujuclock "github.com/juju/clock"
1717
"github.com/juju/collections/set"
1818
"github.com/juju/errors"
19-
"github.com/juju/juju/core/arch"
2019
"github.com/juju/loggo"
2120
"github.com/juju/names/v4"
2221
"github.com/juju/version/v2"
@@ -39,12 +38,10 @@ import (
3938
"k8s.io/client-go/rest"
4039
"k8s.io/utils/pointer"
4140

42-
k8sconstants "github.com/juju/juju/caas/kubernetes/provider/constants"
43-
jujuversion "github.com/juju/juju/version"
44-
4541
"github.com/juju/juju/caas"
4642
k8sapplication "github.com/juju/juju/caas/kubernetes/provider/application"
4743
"github.com/juju/juju/caas/kubernetes/provider/constants"
44+
k8sconstants "github.com/juju/juju/caas/kubernetes/provider/constants"
4845
"github.com/juju/juju/caas/kubernetes/provider/resources"
4946
k8sspecs "github.com/juju/juju/caas/kubernetes/provider/specs"
5047
k8sstorage "github.com/juju/juju/caas/kubernetes/provider/storage"
@@ -53,6 +50,7 @@ import (
5350
"github.com/juju/juju/caas/specs"
5451
"github.com/juju/juju/cloudconfig/podcfg"
5552
k8sannotations "github.com/juju/juju/core/annotations"
53+
"github.com/juju/juju/core/arch"
5654
"github.com/juju/juju/core/assumes"
5755
coreconfig "github.com/juju/juju/core/config"
5856
"github.com/juju/juju/core/devices"
@@ -66,6 +64,7 @@ import (
6664
"github.com/juju/juju/environs/config"
6765
envcontext "github.com/juju/juju/environs/context"
6866
"github.com/juju/juju/storage"
67+
jujuversion "github.com/juju/juju/version"
6968
)
7069

7170
var logger = loggo.GetLogger("juju.kubernetes.provider")

‎cmd/juju/application/deployer/bundlehandler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ func (b bundleArchConstraint) Arch() (string, error) {
17171717
if err != nil {
17181718
return "", errors.Trace(err)
17191719
}
1720-
return constraints.ConstraintArch(cons, &b.defaultConstraints), nil
1720+
return constraints.ArchOrDefault(cons, &b.defaultConstraints), nil
17211721
}
17221722

17231723
func verifyEndpointBindings(endpointBindings map[string]string, knownSpaceNames set.Strings) error {

‎cmd/juju/application/utils/origin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func DeduceOrigin(url *charm.URL, channel charm.Channel, platform corecharm.Plat
8282
// constraints and a base.
8383
func MakePlatform(cons constraints.Value, base series.Base, modelCons constraints.Value) corecharm.Platform {
8484
return corecharm.Platform{
85-
Architecture: constraints.ConstraintArch(cons, &modelCons),
85+
Architecture: constraints.ArchOrDefault(cons, &modelCons),
8686
OS: base.OS,
8787
Channel: base.Channel.Track,
8888
}

‎cmd/juju/commands/bootstrap_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/juju/cmd/v3"
2121
"github.com/juju/cmd/v3/cmdtesting"
2222
"github.com/juju/errors"
23-
"github.com/juju/juju/core/arch"
2423
"github.com/juju/loggo"
2524
mgotesting "github.com/juju/mgo/v3/testing"
2625
jujuos "github.com/juju/os/v2"
@@ -30,12 +29,10 @@ import (
3029
"github.com/juju/utils/v3"
3130
"github.com/juju/version/v2"
3231

33-
gc "gopkg.in/check.v1"
34-
k8scmd "k8s.io/client-go/tools/clientcmd"
35-
3632
"github.com/juju/juju/cloud"
3733
"github.com/juju/juju/cmd/cmdtest"
3834
"github.com/juju/juju/cmd/modelcmd"
35+
"github.com/juju/juju/core/arch"
3936
"github.com/juju/juju/core/constraints"
4037
"github.com/juju/juju/core/model"
4138
coreos "github.com/juju/juju/core/os"
@@ -64,6 +61,8 @@ import (
6461
coretesting "github.com/juju/juju/testing"
6562
coretools "github.com/juju/juju/tools"
6663
jujuversion "github.com/juju/juju/version"
64+
gc "gopkg.in/check.v1"
65+
k8scmd "k8s.io/client-go/tools/clientcmd"
6766
)
6867

6968
type BootstrapSuite struct {

‎cmd/juju/commands/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package commands
66
import (
77
"github.com/juju/cmd/v3"
88
"github.com/juju/gnuflag"
9-
"github.com/juju/juju/core/arch"
109
"github.com/juju/version/v2"
1110

11+
"github.com/juju/juju/core/arch"
1212
coreos "github.com/juju/juju/core/os"
1313
jujuversion "github.com/juju/juju/version"
1414
)

‎cmd/juju/commands/version_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
"fmt"
99

1010
"github.com/juju/cmd/v3/cmdtesting"
11-
"github.com/juju/juju/core/arch"
1211
coreos "github.com/juju/juju/core/os"
1312
"github.com/juju/testing"
1413
jc "github.com/juju/testing/checkers"
1514
"github.com/juju/version/v2"
1615
gc "gopkg.in/check.v1"
1716

17+
"github.com/juju/juju/core/arch"
1818
jujuversion "github.com/juju/juju/version"
1919
)
2020

‎cmd/jujud/agent/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"github.com/juju/cmd/v3"
1717
"github.com/juju/errors"
1818
"github.com/juju/gnuflag"
19-
"github.com/juju/juju/core/arch"
2019
"github.com/juju/names/v4"
2120
"github.com/juju/utils/v3/ssh"
2221
"github.com/juju/version/v2"
@@ -32,6 +31,7 @@ import (
3231
"github.com/juju/juju/cmd/jujud/agent/agentconf"
3332
cmdutil "github.com/juju/juju/cmd/jujud/util"
3433
"github.com/juju/juju/controller"
34+
"github.com/juju/juju/core/arch"
3535
"github.com/juju/juju/core/instance"
3636
"github.com/juju/juju/core/network"
3737
coreos "github.com/juju/juju/core/os"

‎cmd/jujud/agent/machine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/juju/cmd/v3/cmdtesting"
2222
"github.com/juju/collections/set"
2323
"github.com/juju/errors"
24-
"github.com/juju/juju/core/arch"
2524
"github.com/juju/loggo"
2625
"github.com/juju/lumberjack/v2"
2726
"github.com/juju/mgo/v3"
@@ -56,6 +55,7 @@ import (
5655
"github.com/juju/juju/cmd/jujud/agent/model"
5756
"github.com/juju/juju/container/kvm"
5857
"github.com/juju/juju/controller"
58+
"github.com/juju/juju/core/arch"
5959
"github.com/juju/juju/core/auditlog"
6060
"github.com/juju/juju/core/instance"
6161
"github.com/juju/juju/core/life"

‎cmd/jujud/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/juju/cmd/v3"
2020
"github.com/juju/errors"
2121
"github.com/juju/featureflag"
22-
"github.com/juju/juju/core/arch"
2322
"github.com/juju/loggo"
2423
"github.com/juju/names/v4"
2524
proxyutils "github.com/juju/proxy"
@@ -36,6 +35,7 @@ import (
3635
"github.com/juju/juju/cmd/jujud/dumplogs"
3736
"github.com/juju/juju/cmd/jujud/introspect"
3837
"github.com/juju/juju/cmd/jujud/run"
38+
"github.com/juju/juju/core/arch"
3939
"github.com/juju/juju/core/machinelock"
4040
coreos "github.com/juju/juju/core/os"
4141
jujunames "github.com/juju/juju/juju/names"

‎cmd/plugins/juju-metadata/imagemetadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"github.com/juju/cmd/v3"
1313
"github.com/juju/errors"
1414
"github.com/juju/gnuflag"
15-
"github.com/juju/juju/core/arch"
1615

1716
"github.com/juju/juju/caas"
1817
jujucmd "github.com/juju/juju/cmd"
1918
"github.com/juju/juju/cmd/modelcmd"
19+
"github.com/juju/juju/core/arch"
2020
"github.com/juju/juju/core/series"
2121
"github.com/juju/juju/environs"
2222
"github.com/juju/juju/environs/config"

‎cmd/plugins/juju-metadata/validateagentsmetadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
"github.com/juju/cmd/v3"
1212
"github.com/juju/errors"
1313
"github.com/juju/gnuflag"
14-
"github.com/juju/juju/core/arch"
1514
"github.com/juju/version/v2"
1615

1716
jujucmd "github.com/juju/juju/cmd"
1817
"github.com/juju/juju/cmd/modelcmd"
1918
"github.com/juju/juju/cmd/output"
19+
"github.com/juju/juju/core/arch"
2020
"github.com/juju/juju/environs"
2121
"github.com/juju/juju/environs/simplestreams"
2222
"github.com/juju/juju/environs/tools"

‎cmd/plugins/juju-metadata/validateagentsmetadata_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/aws/aws-sdk-go-v2/service/ec2"
1010
"github.com/juju/cmd/v3"
1111
"github.com/juju/cmd/v3/cmdtesting"
12-
"github.com/juju/juju/core/arch"
1312
jc "github.com/juju/testing/checkers"
1413
gc "gopkg.in/check.v1"
1514

1615
"github.com/juju/juju/cmd/modelcmd"
16+
"github.com/juju/juju/core/arch"
1717
"github.com/juju/juju/environs/filestorage"
1818
"github.com/juju/juju/environs/tools"
1919
"github.com/juju/juju/jujuclient"

‎container/broker/broker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88

99
"github.com/juju/collections/set"
1010
"github.com/juju/errors"
11-
"github.com/juju/juju/core/arch"
1211
"github.com/juju/loggo"
1312
"github.com/juju/names/v4"
1413

1514
apiprovisioner "github.com/juju/juju/api/agent/provisioner"
1615
"github.com/juju/juju/cloudconfig"
1716
"github.com/juju/juju/cloudconfig/instancecfg"
17+
"github.com/juju/juju/core/arch"
1818
"github.com/juju/juju/core/instance"
1919
corenetwork "github.com/juju/juju/core/network"
2020
"github.com/juju/juju/core/series"

‎container/broker/broker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/juju/juju/core/arch"
1211
"github.com/juju/loggo"
1312
"github.com/juju/names/v4"
1413
gitjujutesting "github.com/juju/testing"
@@ -21,6 +20,7 @@ import (
2120
"github.com/juju/juju/cloudconfig/instancecfg"
2221
"github.com/juju/juju/container"
2322
"github.com/juju/juju/container/broker"
23+
"github.com/juju/juju/core/arch"
2424
"github.com/juju/juju/core/constraints"
2525
"github.com/juju/juju/core/instance"
2626
"github.com/juju/juju/core/lxdprofile"

‎container/broker/lxd-broker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/golang/mock/gomock"
1010
"github.com/juju/charm/v10"
1111
"github.com/juju/errors"
12-
"github.com/juju/juju/core/arch"
1312
"github.com/juju/loggo"
1413
"github.com/juju/names/v4"
1514
gitjujutesting "github.com/juju/testing"
@@ -24,6 +23,7 @@ import (
2423
"github.com/juju/juju/container/broker"
2524
"github.com/juju/juju/container/broker/mocks"
2625
"github.com/juju/juju/container/testing"
26+
"github.com/juju/juju/core/arch"
2727
"github.com/juju/juju/core/instance"
2828
"github.com/juju/juju/core/lxdprofile"
2929
corenetwork "github.com/juju/juju/core/network"

‎container/kvm/kvm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
"sync"
1313

1414
"github.com/juju/errors"
15-
"github.com/juju/juju/core/arch"
1615
"github.com/juju/loggo"
1716

1817
"github.com/juju/juju/agent"
1918
"github.com/juju/juju/cloudconfig/cloudinit"
2019
"github.com/juju/juju/cloudconfig/containerinit"
2120
"github.com/juju/juju/cloudconfig/instancecfg"
2221
"github.com/juju/juju/container"
22+
"github.com/juju/juju/core/arch"
2323
"github.com/juju/juju/core/constraints"
2424
"github.com/juju/juju/core/instance"
2525
"github.com/juju/juju/core/series"

‎container/kvm/kvm_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,19 @@ import (
99
"path/filepath"
1010
"sync"
1111

12-
"github.com/juju/juju/core/network"
13-
14-
"github.com/juju/juju/container/kvm/mock"
15-
16-
"github.com/juju/juju/core/arch"
1712
"github.com/juju/loggo"
1813
jc "github.com/juju/testing/checkers"
1914
gc "gopkg.in/check.v1"
2015

2116
"github.com/juju/juju/container"
2217
"github.com/juju/juju/container/kvm"
18+
"github.com/juju/juju/container/kvm/mock"
2319
kvmtesting "github.com/juju/juju/container/kvm/testing"
2420
containertesting "github.com/juju/juju/container/testing"
21+
"github.com/juju/juju/core/arch"
2522
"github.com/juju/juju/core/constraints"
2623
"github.com/juju/juju/core/instance"
24+
"github.com/juju/juju/core/network"
2725
"github.com/juju/juju/environs/config"
2826
"github.com/juju/juju/environs/imagemetadata"
2927
coretesting "github.com/juju/juju/testing"

‎container/kvm/libvirt/domainxml.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"fmt"
99

1010
"github.com/juju/errors"
11+
1112
"github.com/juju/juju/core/arch"
1213
)
1314

‎container/kvm/live_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ import (
99
"os/exec"
1010
"runtime"
1111

12-
"github.com/juju/juju/core/network"
13-
"github.com/juju/juju/core/series"
14-
15-
"github.com/juju/juju/core/arch"
1612
"github.com/juju/loggo"
1713
jc "github.com/juju/testing/checkers"
1814
"github.com/juju/version/v2"
@@ -21,7 +17,10 @@ import (
2117
"github.com/juju/juju/cloudconfig/instancecfg"
2218
"github.com/juju/juju/container"
2319
"github.com/juju/juju/container/kvm"
20+
"github.com/juju/juju/core/arch"
2421
"github.com/juju/juju/core/constraints"
22+
"github.com/juju/juju/core/network"
23+
"github.com/juju/juju/core/series"
2524
"github.com/juju/juju/core/status"
2625
"github.com/juju/juju/environs/config"
2726
"github.com/juju/juju/environs/imagemetadata"

0 commit comments

Comments
 (0)