Merge pull request #12043 from wallyworld/drop-legacy-oracle

#12043 ## Description of change The oracle classic provider is no longer functional (Oracle dropped upstream support, no images etc) so remove it from Juju. ## QA steps ``` $ juju bootstrap oracle-classic ERROR unknown cloud "oracle-classic", please try "juju update-public-clouds" ``` ## Documentation changes We'll need to remove oracle classic in any docs.
juju · Sep 23, 2020 · 56b5f51 · 56b5f51
2 parents 194ea27 + 9c0fb77
commit 56b5f51
Show file tree

Hide file tree

Showing 42 changed files with 2 additions and 8,707 deletions.
diff --git a/cloud/clouds_test.go b/cloud/clouds_test.go
@@ -23,7 +23,7 @@ type cloudSuite struct {
 var _ = gc.Suite(&cloudSuite{})
 
 var publicCloudNames = []string{
-	"aws", "aws-china", "aws-gov", "google", "azure", "azure-china", "rackspace", "joyent", "cloudsigma", "oracle", "oracle-classic",
+	"aws", "aws-china", "aws-gov", "google", "azure", "azure-china", "rackspace", "joyent", "cloudsigma", "oracle",
 }
 
 func parsePublicClouds(c *gc.C) map[string]cloud.Cloud {

diff --git a/cloud/fallback-public-cloud.yaml b/cloud/fallback-public-cloud.yaml
@@ -371,18 +371,3 @@ clouds:
         endpoint: https://iaas.eu-frankfurt-1.oraclecloud.com
       uk-london-1:
         endpoint: https://iaas.uk-london-1.oraclecloud.com
-  oracle-classic:
-    type: oracle
-    description: Oracle Cloud Infrastructure Classic
-    auth-types: [ userpass ]
-    regions:
-      uscom-central-1:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us2:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us6:
-        endpoint: https://compute.us6.oraclecloud.com
-      em2:
-        endpoint: https://compute.em2.oraclecloud.com
-      em3:
-        endpoint: https://compute.em3.oraclecloud.com
diff --git a/cloud/fallback_public_cloud.go b/cloud/fallback_public_cloud.go
@@ -378,19 +378,4 @@ clouds:
         endpoint: https://iaas.eu-frankfurt-1.oraclecloud.com
       uk-london-1:
         endpoint: https://iaas.uk-london-1.oraclecloud.com
-  oracle-classic:
-    type: oracle
-    description: Oracle Cloud Infrastructure Classic
-    auth-types: [ userpass ]
-    regions:
-      uscom-central-1:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us2:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us6:
-        endpoint: https://compute.us6.oraclecloud.com
-      em2:
-        endpoint: https://compute.em2.oraclecloud.com
-      em3:
-        endpoint: https://compute.em3.oraclecloud.com
 `
diff --git a/cmd/juju/commands/bootstrap_test.go b/cmd/juju/commands/bootstrap_test.go
@@ -1932,7 +1932,6 @@ cloudsigma
 google                                        
 joyent                                        
 oracle                                        
-oracle-classic                                
 rackspace                                     \n?(localhost\s+)?(microk8s\s+)?
 dummy-cloud                      joe          home
 dummy-cloud-dummy-region-config               
@@ -1996,7 +1995,6 @@ cloudsigma
 google                                        
 joyent                                        
 oracle                                        
-oracle-classic                                
 rackspace                                     \n?(localhost\s+)?(microk8s\s+)?
 dummy-cloud-dummy-region-config               
 dummy-cloud-with-config                       

diff --git a/cmd/juju/commands/exec_test.go b/cmd/juju/commands/exec_test.go
@@ -218,7 +218,7 @@ func (*ExecSuite) TestTimeoutArgParsing(c *gc.C) {
 	}, {
 		message:  "invalid time",
 		args:     []string{"--timeout=foo", "--all", "sudo reboot"},
-		errMatch: `invalid value "foo" for option --timeout: time: invalid duration foo`,
+		errMatch: `invalid value "foo" for option --timeout: time: invalid duration "?foo"?`,
 		modeType: model.IAAS,
 	}, {
 		message:  "two hours",

diff --git a/go.mod b/go.mod
@@ -51,7 +51,6 @@ require (
 	github.com/juju/errors v0.0.0-20200330140219-3fe23663418f
 	github.com/juju/featureflag v0.0.0-20200423045028-e2f9e1cb1611
 	github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d
-	github.com/juju/go-oracle-cloud v0.0.0-20170421134547-932a8cea00a1
 	github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect
 	github.com/juju/gojsonschema v0.0.0-20150312170016-e1ad140384f2
 	github.com/juju/gomaasapi v0.0.0-20190826212825-0ab1eb636aba

diff --git a/go.sum b/go.sum
@@ -421,8 +421,6 @@ github.com/juju/featureflag v0.0.0-20200423045028-e2f9e1cb1611 h1:qYMzwsKsEBtgdS
 github.com/juju/featureflag v0.0.0-20200423045028-e2f9e1cb1611/go.mod h1:Xyly79yyEtbs4CizvwlQkdV9XLBqytrJm6Pz579cCSA=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d h1:c93kUJDtVAXFEhsCh5jSxyOJmFHuzcihnslQiX8Urwo=
 github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
-github.com/juju/go-oracle-cloud v0.0.0-20170421134547-932a8cea00a1 h1:prQSgzU8eKdTD+Po4DIYviutE8GMpGp3zkoY0ggVqgY=
-github.com/juju/go-oracle-cloud v0.0.0-20170421134547-932a8cea00a1/go.mod h1:aC7I7BnFXPTr0ruRe6OlLYu5wmuk8/mJGhBCD5TQ49g=
 github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a h1:45JtCyuNYE+QN9aPuR1ID9++BQU+NMTMudHSuaK0Las=
 github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a/go.mod h1:RVHtZuvrpETIepiNUrNlih2OynoFf1eM6DGC6dloXzk=
 github.com/juju/gojsonpointer v0.0.0-20150204194629-afe8b77aa08f h1:QzpKmMsaP06HVZnYNlcy1CLIXPytsj2NuzfCHitxuus=

diff --git a/provider/all/oracle.go b/provider/all/oracle.go
diff --git a/provider/oracle/common/interfaces.go b/provider/oracle/common/interfaces.go