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.

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

replace useGoogleServicesDebugFile task with file in debug flavor #1434

Merged
merged 6 commits into from
Oct 21, 2023

Conversation

eighthave
Copy link
Contributor

@eighthave eighthave commented Oct 3, 2023

#1206 (comment)

Description

Simplify build flavor setup so that we can introduce a "free" flavor #1206

Based on this suggestion:
#1206 (comment)

This could additionally include the same changes to the "wear" and "automotive" flavors.

Testing Instructions

./gradlew build

Checklist

  • If this is a user-facing change, I have added an entry in CHANGELOG.md
  • Ensure the linter passes (./gradlew spotlessApply to automatically apply formatting/linting)
  • I have considered whether it makes sense to add tests for my changes
  • All strings that need to be localized are in modules/services/localization/src/main/res/values/strings.xml
  • Any jetpack compose components I added or changed are covered by compose previews

This accomplishes a few things:
1. Removes some entries in .gitleaksignore which were incorrect (the
   commit hash did not match the commit that introduced the change)
2. Moves our handling of the debug google services file to a gitleaks
   config file. That means that no matter where that secret shows up, it
   will be allowed (as opposed to handling it in the gitleaksignore file
   which required specifying every location/commit where the secret was
   introduced).
3. Adds the old IntentUtilTest example api key to the list of ignored
   secrets so that it does not get flagged up when running `gitleaks detect`.
Applying the same change that we did to the app module in e306375.
@mchowning
Copy link
Contributor

mchowning commented Oct 3, 2023

Thanks @eighthave ! This looks good. 👍

I pushed a few commits doing just a bit of housekeeping, and also extending this approach to the wear and automotive apps. Let me know if you have any thoughts about those updates.

Since I've pushed some non-trivial changes, let me also ask @geekygecko and @ashiagr to take a look at this, particularly at the gitleaks change I made in fed547e.

@eighthave
Copy link
Contributor Author

LGTM!

@geekygecko
Copy link
Member

Since I've pushed some non-trivial changes, let me also ask @geekygecko and @ashiagr to take a look at this, particularly at the gitleaks change I made in fed547e.

It looks good to me. Should we comment on what the entries in allowlist -> regexes are? It took me a little while to realise it was the Google Services API key.

@mchowning
Copy link
Contributor

Should we comment on what the entries in allowlist -> regexes are? It took me a little while to realise it was the Google Services API key.

Good idea @geekygecko . I added that in 95311e5.

@geekygecko geekygecko merged commit 6053fd6 into Automattic:main Oct 21, 2023
8 checks passed
@eighthave eighthave deleted the debug-google-services.json branch October 23, 2023 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants