You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by "volatilemolotov (via GitHub)" <gi...@apache.org> on 2023/05/24 08:50:03 UTC

[GitHub] [beam] volatilemolotov opened a new pull request, #26859: fix: get google apt key with gpg commmand

volatilemolotov opened a new pull request, #26859:
URL: https://github.com/apache/beam/pull/26859

   Changes the way google apt key was ingested. It now uses `gpg` command instead of `tee` which is the way google official documentation does it. 
   Something changed in the way apt handles keys
   
   ------------------------
   
   Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
   
    - [ ] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment `fixes #<ISSUE NUMBER>` instead.
    - [ ] Update `CHANGES.md` with noteworthy changes.
    - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
   
   See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/get-started-contributing/#make-the-reviewers-job-easier).
   
   To check the build health, please visit [https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md](https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md)
   
   GitHub Actions Tests Status (on master branch)
   ------------------------------------------------------------------------------------------------
   [![Build python source distribution and wheels](https://github.com/apache/beam/workflows/Build%20python%20source%20distribution%20and%20wheels/badge.svg?branch=master&event=schedule)](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
   [![Python tests](https://github.com/apache/beam/workflows/Python%20tests/badge.svg?branch=master&event=schedule)](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
   [![Java tests](https://github.com/apache/beam/workflows/Java%20Tests/badge.svg?branch=master&event=schedule)](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
   [![Go tests](https://github.com/apache/beam/workflows/Go%20tests/badge.svg?branch=master&event=schedule)](https://github.com/apache/beam/actions?query=workflow%3A%22Go+tests%22+branch%3Amaster+event%3Aschedule)
   
   See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [beam] volatilemolotov commented on a diff in pull request #26859: fix: get google apt key with gpg commmand

Posted by "volatilemolotov (via GitHub)" <gi...@apache.org>.
volatilemolotov commented on code in PR #26859:
URL: https://github.com/apache/beam/pull/26859#discussion_r1206507351


##########
playground/infrastructure/cloudbuild/cloudbuild_playground_infra.sh:
##########
@@ -40,16 +40,31 @@ apt-get -qq install -y google-cloud-sdk-gke-gcloud-auth-plugin google-cloud-sdk
 git clone --branch $BRANCH_NAME $REPO_NAME --single-branch
 cd beam
 mkdir playground/terraform/environment/$ENVIRONMENT_NAME
- 
-gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
-if [ $? -eq 0 ]
-then 
-        echo "Creation successfull"
+
+
+checkBucket=$(curl -s -H "X-Goog-User-Project: $(gcloud config get-value project)" -H "Authorization: Bearer $(gcloud auth print-access-token)" https://storage.googleapis.com/storage/v1/b/$TF_VAR_state_bucket -w "%{http_code}" -o /dev/null)
+if [ $checkBucket -eq 200 ]; then
+        echo "Bucket already exists"
+elif [ $checkBucket -eq 404 ]; then
+        echo "Bucket does not exist, creating"
+        gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
+                if [ $? -eq 0 ]
+                then 
+                        echo "Creation successfull"
+                else
+                        echo "Cannot create bucket, gcloud exit code: $?"
+                        exit 1
+                fi
+elif [ $checkBucket -eq 401 ]; then
+        echo "You do not have permission to access this bucket"
+        exit 1
 else
-        echo "Cannot create bucket, please check if the name is unique"
+        echo "Something went wrong, please check the bucket name"

Review Comment:
   Its part of the else wiring. Added a write of the error code, not sure what else to expect



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [beam] Abacn merged pull request #26859: fix: get google apt key with gpg commmand

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn merged PR #26859:
URL: https://github.com/apache/beam/pull/26859


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [beam] Abacn commented on a diff in pull request #26859: fix: get google apt key with gpg commmand

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn commented on code in PR #26859:
URL: https://github.com/apache/beam/pull/26859#discussion_r1205604221


##########
playground/infrastructure/cloudbuild/cloudbuild_playground_infra.sh:
##########
@@ -40,16 +40,31 @@ apt-get -qq install -y google-cloud-sdk-gke-gcloud-auth-plugin google-cloud-sdk
 git clone --branch $BRANCH_NAME $REPO_NAME --single-branch
 cd beam
 mkdir playground/terraform/environment/$ENVIRONMENT_NAME
- 
-gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
-if [ $? -eq 0 ]
-then 
-        echo "Creation successfull"
+
+
+checkBucket=$(curl -s -H "X-Goog-User-Project: $(gcloud config get-value project)" -H "Authorization: Bearer $(gcloud auth print-access-token)" https://storage.googleapis.com/storage/v1/b/$TF_VAR_state_bucket -w "%{http_code}" -o /dev/null)
+if [ $checkBucket -eq 200 ]; then
+        echo "Bucket already exists"
+elif [ $checkBucket -eq 404 ]; then
+        echo "Bucket does not exist, creating"
+        gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
+                if [ $? -eq 0 ]
+                then 
+                        echo "Creation successfull"
+                else
+                        echo "Cannot create bucket, gcloud exit code: $?"
+                        exit 1
+                fi
+elif [ $checkBucket -eq 401 ]; then
+        echo "You do not have permission to access this bucket"
+        exit 1
 else
-        echo "Cannot create bucket, please check if the name is unique"
+        echo "Something went wrong, please check the bucket name"

Review Comment:
   Can we have a more specific error message?



##########
playground/infrastructure/cloudbuild/cloudbuild_playground_infra.sh:
##########
@@ -40,16 +40,31 @@ apt-get -qq install -y google-cloud-sdk-gke-gcloud-auth-plugin google-cloud-sdk
 git clone --branch $BRANCH_NAME $REPO_NAME --single-branch
 cd beam
 mkdir playground/terraform/environment/$ENVIRONMENT_NAME
- 
-gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
-if [ $? -eq 0 ]
-then 
-        echo "Creation successfull"
+
+
+checkBucket=$(curl -s -H "X-Goog-User-Project: $(gcloud config get-value project)" -H "Authorization: Bearer $(gcloud auth print-access-token)" https://storage.googleapis.com/storage/v1/b/$TF_VAR_state_bucket -w "%{http_code}" -o /dev/null)

Review Comment:
   some comment is appreciate, like "# HTTP response of ... "



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [beam] volatilemolotov commented on a diff in pull request #26859: fix: get google apt key with gpg commmand

Posted by "volatilemolotov (via GitHub)" <gi...@apache.org>.
volatilemolotov commented on code in PR #26859:
URL: https://github.com/apache/beam/pull/26859#discussion_r1206507650


##########
playground/infrastructure/cloudbuild/cloudbuild_playground_infra.sh:
##########
@@ -40,16 +40,31 @@ apt-get -qq install -y google-cloud-sdk-gke-gcloud-auth-plugin google-cloud-sdk
 git clone --branch $BRANCH_NAME $REPO_NAME --single-branch
 cd beam
 mkdir playground/terraform/environment/$ENVIRONMENT_NAME
- 
-gcloud storage buckets create gs://$TF_VAR_state_bucket --location $TF_VAR_region --project $TF_VAR_project_id --pap
-if [ $? -eq 0 ]
-then 
-        echo "Creation successfull"
+
+
+checkBucket=$(curl -s -H "X-Goog-User-Project: $(gcloud config get-value project)" -H "Authorization: Bearer $(gcloud auth print-access-token)" https://storage.googleapis.com/storage/v1/b/$TF_VAR_state_bucket -w "%{http_code}" -o /dev/null)

Review Comment:
   Added comment explaning that it checks for bucket, creates if missing



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


[GitHub] [beam] github-actions[bot] commented on pull request #26859: fix: get google apt key with gpg commmand

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #26859:
URL: https://github.com/apache/beam/pull/26859#issuecomment-1561750618

   Assigning reviewers. If you would like to opt out of this review, comment `assign to next reviewer`:
   
   R: @Abacn added as fallback since no labels match configuration
   
   Available commands:
   - `stop reviewer notifications` - opt out of the automated review tooling
   - `remind me after tests pass` - tag the comment author after tests pass
   - `waiting on author` - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)
   
   The PR bot will only process comments in the main thread (not review comments).


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org