You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2023/07/29 07:37:12 UTC
[jclouds] branch master updated (ef580d4aa7 -> 1252f1951f)
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
from ef580d4aa7 Bump okio from 1.17.2 to 3.4.0 in /drivers/okhttp
new 20ebc67fc8 Update google-cloud-storage regions
new 1252f1951f Replace US_CENTRAL2 with US_CENTRAL1 in tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../domain/DomainResourceReferences.java | 28 +++++++++++++++-------
.../features/BucketApiLiveTest.java | 10 ++++----
.../parse/ParseRegionListTest.java | 8 +++----
.../src/test/resources/region_list.json | 10 ++++----
4 files changed, 34 insertions(+), 22 deletions(-)
[jclouds] 02/02: Replace US_CENTRAL2 with US_CENTRAL1 in tests
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 1252f1951f10c3bc47923184bbbb9d4aadc1b3fc
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sat Jul 29 15:59:14 2023 +0900
Replace US_CENTRAL2 with US_CENTRAL1 in tests
US_CENTRAL2 has been removed.
---
.../jclouds/googlecloudstorage/features/BucketApiLiveTest.java | 10 +++++-----
.../jclouds/googlecomputeengine/parse/ParseRegionListTest.java | 8 ++++----
.../google-compute-engine/src/test/resources/region_list.json | 10 +++++-----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
index 2639f215ef..ec45915e42 100644
--- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
+++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/BucketApiLiveTest.java
@@ -95,7 +95,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
Logging log = Logging.create(LOG_BUCKET_NAME, BUCKET_NAME);
BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).addAcl(acl).addDefaultObjectAccessControls(oac)
- .versioning(version).location(Location.US_CENTRAL2).logging(log)
+ .versioning(version).location(Location.US_CENTRAL1).logging(log)
.storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors);
Bucket response = api().createBucket(PROJECT_NUMBER, template);
@@ -104,7 +104,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertNotNull(response.cors());
assertTrue(response.cors().size() == 1);
assertEquals(response.name(), BUCKET_NAME);
- assertEquals(response.location(), Location.US_CENTRAL2);
+ assertEquals(response.location(), Location.US_CENTRAL1);
assertThat(response.storageClass()).isEqualTo(StorageClass.DURABLE_REDUCED_AVAILABILITY);
assertTrue(response.versioning().enabled());
}
@@ -197,7 +197,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
@Test(groups = "live", dependsOnMethods = { "testCreateBucket" })
public void testCreateAlreadyExistBucket() {
- BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).location(Location.US_CENTRAL2)
+ BucketTemplate template = new BucketTemplate().name(BUCKET_NAME).location(Location.US_CENTRAL1)
.storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY);
assertNull(api().createBucket(PROJECT_NUMBER, template));
@@ -212,7 +212,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
Versioning version = Versioning.create(true);
BucketTemplate template = new BucketTemplate().name(BUCKET_NAME_WITHOPTIONS).addDefaultObjectAccessControls(oac)
- .versioning(version).location(Location.US_CENTRAL2)
+ .versioning(version).location(Location.US_CENTRAL1)
.storageClass(StorageClass.DURABLE_REDUCED_AVAILABILITY).addCORS(cors);
InsertBucketOptions options = new InsertBucketOptions().projection(Projection.FULL);
@@ -222,7 +222,7 @@ public class BucketApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
assertNotNull(response);
assertNotNull(response.cors());
assertEquals(response.name(), BUCKET_NAME_WITHOPTIONS);
- assertEquals(response.location(), Location.US_CENTRAL2);
+ assertEquals(response.location(), Location.US_CENTRAL1);
assertTrue(response.versioning().enabled());
}
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
index 61f96b3096..e24bf4c65c 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/parse/ParseRegionListTest.java
@@ -50,11 +50,11 @@ public class ParseRegionListTest extends BaseGoogleComputeEngineParseTest<ListPa
Region region2 = Region.create( //
"6396763663251190992", // id
parse("2013-07-08T14:40:37.939-07:00"), // creationTimestamp
- URI.create(baseUrl + "/party/regions/us-central2"), // selfLink
- "us-central2", // name
- "us-central2", // description
+ URI.create(baseUrl + "/party/regions/us-central1"), // selfLink
+ "us-central1", // name
+ "us-central1", // description
Region.Status.UP, // status
- ImmutableList.of(URI.create(baseUrl + "/party/zones/us-central2-a")), // zones
+ ImmutableList.of(URI.create(baseUrl + "/party/zones/us-central1-a")), // zones
ImmutableList.of( //
Quota.create("INSTANCES", 0, 8), //
Quota.create("CPUS", 0, 8), //
diff --git a/providers/google-compute-engine/src/test/resources/region_list.json b/providers/google-compute-engine/src/test/resources/region_list.json
index c9edc337a7..a75d51227e 100644
--- a/providers/google-compute-engine/src/test/resources/region_list.json
+++ b/providers/google-compute-engine/src/test/resources/region_list.json
@@ -65,14 +65,14 @@
},
{
"kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central2",
+ "selfLink": "https://www.googleapis.com/compute/v1/projects/party/regions/us-central1",
"id": "6396763663251190992",
"creationTimestamp": "2013-07-08T14:40:37.939-07:00",
- "name": "us-central2",
- "description": "us-central2",
+ "name": "us-central1",
+ "description": "us-central1",
"status": "UP",
"zones": [
- "https://www.googleapis.com/compute/v1/projects/party/zones/us-central2-a"
+ "https://www.googleapis.com/compute/v1/projects/party/zones/us-central1-a"
],
"quotas": [
{
@@ -123,4 +123,4 @@
]
}
]
-}
\ No newline at end of file
+}
[jclouds] 01/02: Update google-cloud-storage regions
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 20ebc67fc8c1d9fd55605cc9e5e419adf97b4006
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sat Jul 29 15:36:35 2023 +0900
Update google-cloud-storage regions
---
.../domain/DomainResourceReferences.java | 28 +++++++++++++++-------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DomainResourceReferences.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DomainResourceReferences.java
index 00a89bf420..f87e48520f 100644
--- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DomainResourceReferences.java
+++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DomainResourceReferences.java
@@ -37,7 +37,10 @@ public final class DomainResourceReferences {
/*
* Multi-Regional
*/
- ASIA, EU, US,
+ ASIA,
+ EU,
+ IN,
+ US,
/*
* Regional
@@ -47,36 +50,45 @@ public final class DomainResourceReferences {
ASIA_NORTHEAST1,
ASIA_NORTHEAST2,
ASIA_NORTHEAST3,
- ASIA_SOUTH1,
ASIA_SOUTHEAST1,
+
+ ASIA_SOUTH1,
+ ASIA_SOUTH2,
+
ASIA_SOUTHEAST2,
+ ME_CENTRAL1,
+ ME_WEST1,
+
NORTHAMERICA_NORTHEAST1,
+ NORTHAMERICA_NORTHEAST2,
US_CENTRAL1,
US_EAST1,
US_EAST4,
+ US_EAST5,
+ US_SOUTH1,
US_WEST1,
US_WEST2,
US_WEST3,
US_WEST4,
SOUTHAMERICA_EAST1,
+ SOUTHAMERICA_WEST1,
EUROPE_CENTRAL2,
EUROPE_NORTH1,
+ EUROPE_SOUTHWEST1,
EUROPE_WEST1,
EUROPE_WEST2,
EUROPE_WEST3,
EUROPE_WEST4,
EUROPE_WEST6,
+ EUROPE_WEST8,
+ EUROPE_WEST9,
+ EUROPE_WEST12,
AUSTRALIA_SOUTHEAST1,
-
- /*
- * Alpha locations
- */
- @Beta
- US_CENTRAL2;
+ AUSTRALIA_SOUTHEAST2;
public String value() {
return name().replace('_', '-');