diff options
| author | Zach Smith <zach@driver.xyz> | 2018-09-12 17:14:53 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2018-10-09 18:59:24 -0700 |
| commit | 1fcf4d39683c39acbf4523480ff63247aae47508 (patch) | |
| tree | bff24f91a6382ab5e71461a702d4e3f9ad18970c | |
| parent | 3557098f101745cd6be32527f1c628e9d6d9959d (diff) | |
| download | driver-core-1fcf4d39683c39acbf4523480ff63247aae47508.tar.gz driver-core-1fcf4d39683c39acbf4523480ff63247aae47508.tar.bz2 driver-core-1fcf4d39683c39acbf4523480ff63247aae47508.zip | |
Add project to AliCloud platformv2.0.0-M3
3 files changed, 12 insertions, 5 deletions
diff --git a/core-init/src/main/scala/xyz/driver/core/init/CloudServices.scala b/core-init/src/main/scala/xyz/driver/core/init/CloudServices.scala index 8419f90..8c51e38 100644 --- a/core-init/src/main/scala/xyz/driver/core/init/CloudServices.scala +++ b/core-init/src/main/scala/xyz/driver/core/init/CloudServices.scala @@ -76,8 +76,8 @@ trait CloudServices extends AkkaBootable { self => platform match { case p @ Platform.GoogleCloud(keyfile, _) => GcsBlobStorage.fromKeyfile(keyfile, s"${p.project}-$bucketName") - case Platform.AliCloud(_, accessId, accessKey, region, _) => - AliyunBlobStorage(accessId, accessKey, region, bucketName, java.time.Clock.systemDefaultZone()) + case Platform.AliCloud(project, _, accessId, accessKey, region, _) => + AliyunBlobStorage(accessId, accessKey, region, s"$project-$bucketName", java.time.Clock.systemDefaultZone()) case Platform.Dev => new FileSystemBlobStorage(Paths.get(s".data-$bucketName")) } @@ -88,7 +88,7 @@ trait CloudServices extends AkkaBootable { self => def messageBus: StreamBus = platform match { case p @ Platform.GoogleCloud(_, namespace) => new GoogleBus(p.credentials, namespace) with StreamBus with CreateOnDemand - case Platform.AliCloud(accountId, accessId, accessKey, region, namespace) => + case Platform.AliCloud(_, accountId, accessId, accessKey, region, namespace) => new AliyunBus(accountId, accessId, accessKey, region, namespace) with StreamBus with CreateOnDemand case Platform.Dev => new QueueBus()(self.system) with StreamBus diff --git a/core-init/src/main/scala/xyz/driver/core/init/Platform.scala b/core-init/src/main/scala/xyz/driver/core/init/Platform.scala index dced0e9..8f8ef83 100644 --- a/core-init/src/main/scala/xyz/driver/core/init/Platform.scala +++ b/core-init/src/main/scala/xyz/driver/core/init/Platform.scala @@ -29,12 +29,19 @@ object Platform { } } - case class AliCloud(accountId: String, accessId: String, accessKey: String, region: String, namespace: String) + case class AliCloud( + project: String, + accountId: String, + accessId: String, + accessKey: String, + region: String, + namespace: String) extends Platform object AliCloud { lazy val fromEnv: AliCloud = { AliCloud( + project = sys.env("CLOUD_PROJECT"), accountId = sys.env("ALICLOUD_ACCOUNT_ID"), accessId = sys.env("ALICLOUD_ACCESS_ID"), accessKey = sys.env("ALICLOUD_ACCESS_KEY"), diff --git a/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala b/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala index e40a83e..388b8f5 100644 --- a/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala +++ b/core-storage/src/main/scala/xyz/driver/core/storage/AliyunBlobStorage.scala @@ -99,7 +99,7 @@ object AliyunBlobStorage { this(clientId, clientSecret, endpoint, bucketId, clock) } - def apply(clientId: String, clientSecret: String, region: String, bucketId: String, cloxk: Clock)( + def apply(clientId: String, clientSecret: String, region: String, bucketId: String, clock: Clock)( implicit ec: ExecutionContext): AliyunBlobStorage = { // https://www.alibabacloud.com/help/doc-detail/31837.htm val endpoint = s"https://oss-$region.aliyuncs.com" |