Skip to content

Commit

Permalink
Merge pull request juju#10662 from SimonRichardson/cmr-migration
Browse files Browse the repository at this point in the history
juju#10662

## Description of change

Note: this PR is the first of many to introduce CMR migrations into
juju, this is the first one that introduces importation of remote
applications. There are no QA steps for this as nothing is done with
the output of the remoteapplications yet.

----

Included in the commit is the addition of the cmr entities for
consuming a remote application. The code is hidden behind a feature
flag to ensure that we don't break any imports that already exist.

Much more work is required to ensure that we also import all the
other entities required.

Part of the change is also the introduction of go mocks in the state
package. This allows us to reach a higher level of coverage without
the need of the persistence layer.

Not only are the tests in mocks, but additionally added to the existing
integration tests that we have in state.

## QA steps

Test pass, offering part will have full QA steps.
  • Loading branch information
jujubot authored Oct 8, 2019
2 parents af0c715 + 4ba783c commit 9d71629
Show file tree
Hide file tree
Showing 28 changed files with 3,759 additions and 78 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ juju-backup-*.tar.gz
.editorconfig
scripts/mgo-run-txn/mgo-run-txn
tests/tmp.*
*.out
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
name = "github.com/juju/bundlechanges"

[[constraint]]
revision = "7eee51ddb1f5033244c6501ec83b399af9d23861"
revision = "303c0a2ac03fb315309324f8a1f7164b27c8193f"
name = "github.com/juju/description"

[[constraint]]
Expand Down
6 changes: 6 additions & 0 deletions feature/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,9 @@ const MultiCloud = "multi-cloud"

// JujuV3 indicates that new CLI commands and behaviour for v3 should be enabled.
const JujuV3 = "juju-v3"

// CMRMigrations indicates that cross model relations (CMR) can migrate
// information from one controller to another controller.
// This feature is disabled during import and export of information, turning
// this on will allow that to happen.
const CMRMigrations = "cmr-migrations"
1 change: 0 additions & 1 deletion scripts/golinters.bash
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ $GOPATH/bin/golangci-lint run \
--enable=misspell \
--enable=unconvert \
--enable=ineffassign \
--deadline=10m \
&> $OUTPUT_FILE

# go through each golangci-lint error and check to see if it's related
Expand Down
Loading

0 comments on commit 9d71629

Please sign in to comment.