You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2020/02/12 13:45:03 UTC
[incubator-dlab] branch DLAB-1536 created (now ef8a2bb)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-1536
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at ef8a2bb [DLAB-1536]: removed bucket creation
This branch includes the following new commits:
new ef8a2bb [DLAB-1536]: removed bucket creation
The 1 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1536]: removed bucket creation
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1536
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ef8a2bb94e7bdca6d4c90c9eb133e31f2dc008f5
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Wed Feb 12 15:44:50 2020 +0200
[DLAB-1536]: removed bucket creation
---
.../terraform/aws/endpoint/main/s3.tf | 37 ----------------------
.../terraform/gcp/endpoint/main/buckets.tf | 35 --------------------
.../terraform/gcp/endpoint/main/variables.tf | 4 ---
3 files changed, 76 deletions(-)
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/s3.tf b/infrastructure-provisioning/terraform/aws/endpoint/main/s3.tf
deleted file mode 100644
index dec9941..0000000
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/s3.tf
+++ /dev/null
@@ -1,37 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-locals {
- shared_s3_name = "${var.service_base_name}-${var.endpoint_id}-shared-bucket"
-}
-
-resource "aws_s3_bucket" "shared_bucket" {
- bucket = local.shared_s3_name
- acl = "private"
- tags = {
- Name = local.shared_s3_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.tag_resource_id}" = "${var.service_base_name}:${local.shared_s3_name}"
- "${var.service_base_name}-Tag" = local.shared_s3_name
- }
- force_destroy = true
-}
-
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/buckets.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/buckets.tf
deleted file mode 100644
index b998fde..0000000
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/buckets.tf
+++ /dev/null
@@ -1,35 +0,0 @@
-# *****************************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# ******************************************************************************
-
-locals {
- shared_bucket_name = "${var.service_base_name}-${var.endpoint_id}-shared-bucket"
- additional_tag = split(":", var.additional_tag)
-}
-
-resource "google_storage_bucket" "shared_bucket" {
- name = local.shared_bucket_name
- force_destroy = true
- labels = {
- name = local.shared_bucket_name
- "${local.additional_tag[0]}" = local.additional_tag[1]
- "${var.service_base_name}-tag" = local.shared_bucket_name
- }
-}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index 6ef2466..170016c 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -140,10 +140,6 @@ variable "product" {
default = "dlab"
}
-variable "bucket_region" {
- default = "US" # Allowed US, EU, ASIA
-}
-
variable "additional_tag" {
default = "product:dlab"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org