Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not need Google credentials before using it #21072

Merged
merged 2 commits into from
Sep 14, 2020
Merged

Do not need Google credentials before using it #21072

merged 2 commits into from
Sep 14, 2020

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Sep 14, 2020 •
edited
Loading

What does this PR do?

This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

Why is it important?

Previously user was required to set a proper credentials file under GOOGLE_APPLICATION_CREDENTIALS environment variable regardless of the operation.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
    - [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

Make sure that GOOGLE_APPLICATION_CREDENTIALS is not set. Run the following command and make sure it does not return an error:

./functionbeat package

Related issues

Closes #17329

@kvch kvch added review Team:Services (Deprecated) Label for the former Integrations-Services team labels Sep 14, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-services (Team:Services)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Sep 14, 2020
@kvch kvch added the needs_backport PR is waiting to be backported to other branches. label Sep 14, 2020
michalpristas
michalpristas approved these changes Sep 14, 2020
View reviewed changes
Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM,
one ?: can getTokenSrc be run concurrently?

@kvch
Copy link
Contributor Author

kvch commented Sep 14, 2020

The function never runs concurrently. The manager is not used concurrently. Users run it on their local machines to manage functions, e.g. deploy or update.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 14, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21072 updated]

  • Start Time: 2020-09-14T12:34:34.139+0000

  • Duration: 39 min 9 sec

Test stats 🧪

Test Results
Failed 0
Passed 453
Skipped 6
Total 459

@kvch kvch merged commit c2efa09 into elastic:master Sep 14, 2020
@kvch kvch mentioned this pull request Sep 14, 2020
Merged
5 tasks
@kvch kvch removed the needs_backport PR is waiting to be backported to other branches. label Sep 14, 2020
kvch added a commit to kvch/beats that referenced this pull request Sep 14, 2020
@kvch
Do not need Google credentials before using it (elastic#21072)
6b4c421 
## What does this PR do?

This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

## Why is it important?

Previously user was required to set a proper credentials file under `GOOGLE_APPLICATION_CREDENTIALS` environment variable regardless of the operation.

Closes elastic#17329

(cherry picked from commit c2efa09)
@kvch kvch added the v7.10.0 label Sep 14, 2020
@kvch kvch mentioned this pull request Sep 14, 2020
Merged
5 tasks
@kvch kvch added the v7.9.2 label Sep 14, 2020
kvch added a commit to kvch/beats that referenced this pull request Sep 14, 2020
@kvch
Do not need Google credentials before using it (elastic#21072)
262d88a 
This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

Previously user was required to set a proper credentials file under `GOOGLE_APPLICATION_CREDENTIALS` environment variable regardless of the operation.

Closes elastic#17329

(cherry picked from commit c2efa09)
kvch added a commit that referenced this pull request Sep 14, 2020
@kvch
Do not need Google credentials before using it (#21072) (#21075)
d4f5735 
## What does this PR do?

This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

## Why is it important?

Previously user was required to set a proper credentials file under `GOOGLE_APPLICATION_CREDENTIALS` environment variable regardless of the operation.

Closes #17329

(cherry picked from commit c2efa09)
kvch added a commit that referenced this pull request Sep 14, 2020
@kvch
Cherry-pick #21072 to 7.9: Do not need Google credentials before usin…
5fdd4cd 
…g it (#21076)

* Add Known issues section with an issue about Functionbeat

* Do not need Google credentials before using it (#21072)

This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

Previously user was required to set a proper credentials file under `GOOGLE_APPLICATION_CREDENTIALS` environment variable regardless of the operation.

Closes #17329

(cherry picked from commit c2efa09)
v1v added a commit to v1v/beats that referenced this pull request Sep 14, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-10
cc07c42 
* upstream/master: (362 commits)
  Add vendoring to Google Cloud Functions again (elastic#21070)
  [Elastic Agent] Add fleet.host.id for sending to endpoint. (elastic#21042)
  Do not need Google credentials before using it (elastic#21072)
  [Filebeat][New Module] Zoom webhook module (elastic#20414)
  Add support for GMT timezone offset in decode_cef (elastic#20993)
  Filebeat: Fix random error on harvester close (elastic#21048)
  Add ingress controller dashboards (elastic#21052)
  Fix loggers in composable module. (elastic#21047)
  [Ingest Manager] Increase kibana client timeout to 5 minutes (elastic#21037)
  Add changelog. (elastic#21041)
  [Elastic Agent] Add support for EQL based conditions (elastic#20994)
  Disable Kafka metricsets based on Jolokia (elastic#20989)
  Update apm agent (elastic#21031)
  Add container ECS fields in kubernetes metadata (elastic#20984)
  Sanitize event.host in Metricbeat (elastic#21022)
  Update api-keys.asciidoc - API key prerequisites (elastic#21026)
  [Filebeat][suricata] Map x509 for suricata/eve fileset (elastic#20973)
  [Filebeat][santa] Map x509 fields in santa module (elastic#20976)
  [Filebeat][fortinet] Map x509 ecs fields for fortinet fw fileset (elastic#20983)
  Bump zeek kerberos/ssl/x509 ecs version (elastic#21003)
  ...
v1v added a commit to v1v/beats that referenced this pull request Sep 14, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-7-64
fcc41b4 
* upstream/master: (364 commits)
  Add vendoring to Google Cloud Functions again (elastic#21070)
  [Elastic Agent] Add fleet.host.id for sending to endpoint. (elastic#21042)
  Do not need Google credentials before using it (elastic#21072)
  [Filebeat][New Module] Zoom webhook module (elastic#20414)
  Add support for GMT timezone offset in decode_cef (elastic#20993)
  Filebeat: Fix random error on harvester close (elastic#21048)
  Add ingress controller dashboards (elastic#21052)
  Fix loggers in composable module. (elastic#21047)
  [Ingest Manager] Increase kibana client timeout to 5 minutes (elastic#21037)
  Add changelog. (elastic#21041)
  [Elastic Agent] Add support for EQL based conditions (elastic#20994)
  Disable Kafka metricsets based on Jolokia (elastic#20989)
  Update apm agent (elastic#21031)
  Add container ECS fields in kubernetes metadata (elastic#20984)
  Sanitize event.host in Metricbeat (elastic#21022)
  Update api-keys.asciidoc - API key prerequisites (elastic#21026)
  [Filebeat][suricata] Map x509 for suricata/eve fileset (elastic#20973)
  [Filebeat][santa] Map x509 fields in santa module (elastic#20976)
  [Filebeat][fortinet] Map x509 ecs fields for fortinet fw fileset (elastic#20983)
  Bump zeek kerberos/ssl/x509 ecs version (elastic#21003)
  ...
v1v added a commit to v1v/beats that referenced this pull request Sep 18, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/ci-pipeli…
4c7e8da 
…ne-2.0

* upstream/master: (44 commits)
  Update users.asciidoc (elastic#20802) (elastic#21108)
  Fix docker provider builder. (elastic#21118)
  [Elastic Agent] Add docker composable dynamic provider. (elastic#20842)
  Add new modules/filesets from rsa2elk for 7.10 (elastic#20820)
  Fix broken links to external websites (elastic#21061)
  [docs] typo in the command line (elastic#20799)
  [Filebeat] add panos type and sub_type (elastic#20912)
  Move the `compute_vm_scalset` to  a light metricset and map the cloud metadata (elastic#21038)
  [Filebeat] Add support for Cloudtrail digest files (elastic#21086)
  Add metrics collection from cost explorer into aws/billing metricset (elastic#20527)
  Add vendoring to Google Cloud Functions again (elastic#21070)
  [Elastic Agent] Add fleet.host.id for sending to endpoint. (elastic#21042)
  Do not need Google credentials before using it (elastic#21072)
  [Filebeat][New Module] Zoom webhook module (elastic#20414)
  Add support for GMT timezone offset in decode_cef (elastic#20993)
  Filebeat: Fix random error on harvester close (elastic#21048)
  Add ingress controller dashboards (elastic#21052)
  Fix loggers in composable module. (elastic#21047)
  [Ingest Manager] Increase kibana client timeout to 5 minutes (elastic#21037)
  Add changelog. (elastic#21041)
  ...
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@kvch
Cherry-pick elastic#21072 to 7.9: Do not need Google credentials befo…
9023b90 
…re using it (elastic#21076)

* Add Known issues section with an issue about Functionbeat

* Do not need Google credentials before using it (elastic#21072)

This PR moves retrieving a GCP token to a later stage of running Functionbeat. From now on tokens are only needed when the operations require it.

Previously user was required to set a proper credentials file under `GOOGLE_APPLICATION_CREDENTIALS` environment variable regardless of the operation.

Closes elastic#17329

(cherry picked from commit 98bb86d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalpristas michalpristas michalpristas approved these changes

Assignees
No one assigned
Labels
review Team:Services (Deprecated) Label for the former Integrations-Services team v7.9.2 v7.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Functionbeat can't find default credentials
3 participants
@kvch @elasticmachine @michalpristas