-
Notifications
You must be signed in to change notification settings - Fork 131
chore(jdbc): moving helper scripts & simplify dependencies #4062
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
7454453
Add makefile & dockerfile
logachev 24350fc
Remove inherited dependencies
logachev 70a91d5
Trim more dependnecies
logachev 346f14d
Update all makefile commands
logachev 8b15c56
Merge branch 'main' into kirl/jdbc_setup
logachev 299d85c
Add versions
logachev 642f5cd
Remove secret
logachev 5976332
Update dockerfile
logachev cf93c2c
Revert explicit versions
logachev a4652c3
Merge branch 'main' into kirl/jdbc_setup
logachev b571614
Merge branch 'main' into kirl/jdbc_setup
logachev 5707834
Merge branch 'main' into kirl/jdbc_setup
logachev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| FROM gcr.io/cloud-devrel-public-resources/java11 | ||
|
|
||
| ENV JDBC_DOCKER_ENV=true | ||
| RUN apt-get update && apt-get install -y zip && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN mkdir /tst | ||
| COPY ./pom.xml /src/pom.xml | ||
| COPY ./java.header /src/java.header | ||
| COPY ./license-checks.xml /src/license-checks.xml | ||
| COPY ./google-cloud-bigquery-jdbc/pom.xml /src/google-cloud-bigquery-jdbc/pom.xml | ||
|
|
||
| COPY ./google-cloud-bigquery /src/google-cloud-bigquery | ||
| COPY ./google-cloud-bigquery-bom /src/google-cloud-bigquery-bom | ||
|
|
||
|
|
||
| WORKDIR /src | ||
| RUN mvn install -DskipTests | ||
|
|
||
| WORKDIR /src/google-cloud-bigquery-jdbc | ||
|
|
||
| ENTRYPOINT [] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| CONTAINER_NAME=jdbc | ||
| PACKAGE_DESTINATION=$(PWD)/drivers | ||
| SRC="$(PWD)/.." | ||
| skipSurefire ?= true | ||
|
|
||
| # no indendation for ifndef\endif due to their evaluation before execution | ||
| .check-env: | | ||
| ifndef GOOGLE_APPLICATION_CREDENTIALS | ||
| $(error GOOGLE_APPLICATION_CREDENTIALS is required to run tests) | ||
| endif | ||
|
|
||
| install: | ||
| mvn clean install | ||
|
|
||
| clean: | ||
| mvn clean | ||
|
|
||
| lint: | ||
| mvn com.spotify.fmt:fmt-maven-plugin:format | ||
|
|
||
| unittest: | | ||
| mvn -B -ntp \ | ||
| -DtrimStackTrace=false \ | ||
| -Dclirr.skip=true \ | ||
| -Denforcer.skip=true \ | ||
| -Dtest=$(test) \ | ||
| test | ||
|
|
||
| # Important: By default, this command will skip unittests. | ||
| # To include unit tests, run: make integration-test skipSurefire=false | ||
| integration-test: .check-env | ||
| mvn -B -ntp \ | ||
| -Penable-integration-tests \ | ||
| -DtrimStackTrace=false \ | ||
| -DskipSurefire=$(skipSurefire) \ | ||
| -Dclirr.skip=true \ | ||
| -Denforcer.skip=true \ | ||
| -Dit.failIfNoSpecifiedTests=false \ | ||
| -Dit.test=$(test) \ | ||
| integration-test | ||
|
|
||
| unit-test-coverage: | ||
| $(MAKE) unittest | ||
| mvn -B -ntp jacoco:report | ||
| BUILD_DIR=$$(mvn -B -ntp help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \ | ||
| cd $$BUILD_DIR/site && zip -r $$OLDPWD/jacoco-unittests.zip jacoco && cd $$OLDPWD | ||
|
|
||
| full-coverage: .check-env | ||
| $(MAKE) integration-test skipSurefire=false test=ITBigQueryJDBCTest,ITNightlyBigQueryTest | ||
| mvn -B -ntp jacoco:report | ||
| BUILD_DIR=$$(mvn -B -ntp help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \ | ||
| cd $$BUILD_DIR/site && zip -r $$OLDPWD/jacoco-full.zip jacoco && cd $$OLDPWD | ||
|
|
||
| package: | ||
| mvn clean package \ | ||
| -DincludeScope=runtime \ | ||
| -Dmaven.test.skip=true | ||
| mvn dependency:copy-dependencies \ | ||
| -DincludeScope=runtime | ||
| ${MAKE} generate-dependency-list | ||
|
|
||
| package-all-dependencies: | ||
| mvn package \ | ||
| -DincludeScope=runtime \ | ||
| -Dmaven.test.skip=true \ | ||
| -P=release-all-dependencies | ||
|
|
||
| package-all-dependencies-shaded: | ||
| mvn package \ | ||
| -DincludeScope=runtime \ | ||
| -Dmaven.test.skip=true \ | ||
| -P=release-all-dependencies,release-all-dependencies-shaded | ||
|
|
||
| generate-dependency-list: | ||
| mvn -B dependency:list \ | ||
| -f pom.xml \ | ||
| -DincludeScope=runtime | grep :jar: | sed -E "s/^.* ([^: ]+):([^:]+):([^:]+):([^:]+).*/<dependency><groupId>\1<\/groupId><artifactId>\2<\/artifactId><version>\4<\/version><\/dependency>/g" > dependencies.txt | ||
|
|
||
| # Commands for dockerized environments | ||
| .docker-run: | | ||
| docker run -it \ | ||
| -v $(GOOGLE_APPLICATION_CREDENTIALS):/auth/application_creds.json \ | ||
| -v "$(GOOGLE_APPLICATION_CREDENTIALS).p12":/auth/application_creds.p12 \ | ||
| -e "GOOGLE_APPLICATION_CREDENTIALS=/auth/application_creds.json" \ | ||
| -v $(SRC):/src \ | ||
| -e "SA_EMAIL=test_email" \ | ||
| -e "SA_SECRET=/auth/application_creds.json" \ | ||
| -e "SA_SECRET_P12=/auth/application_creds.p12" \ | ||
| $(CONTAINER_NAME) $(args) | ||
|
|
||
| docker-build: | ||
| docker build -t $(CONTAINER_NAME) -f Dockerfile .. | ||
|
|
||
| docker-session: | ||
| $(MAKE) .docker-run args="bash" | ||
|
|
||
| docker-package-all-dependencies: docker-build | ||
| mkdir -p $(PACKAGE_DESTINATION) | ||
| docker run \ | ||
| -v $(SRC):/src \ | ||
| -v $(PACKAGE_DESTINATION):/pkg \ | ||
| $(CONTAINER_NAME) \ | ||
| sh -c "make package-all-dependencies && \ | ||
| cp --no-preserve=ownership /mvn/test-target/google-cloud-bigquery-jdbc-*.jar /pkg && \ | ||
| rm -f /pkg/*tests.jar" | ||
|
|
||
| docker-package-all-dependencies-shaded: docker-build | ||
| mkdir -p $(PACKAGE_DESTINATION) | ||
| docker run \ | ||
| -v $(SRC):/src \ | ||
| -v $(PACKAGE_DESTINATION):/pkg \ | ||
| $(CONTAINER_NAME) \ | ||
| sh -c "make package-all-dependencies-shaded && \ | ||
| cp --no-preserve=ownership /mvn/test-target/google-cloud-bigquery-jdbc-*.jar /pkg && \ | ||
| rm -f /pkg/*tests.jar" | ||
|
|
||
| docker-package: docker-build | ||
| mkdir -p $(PACKAGE_DESTINATION) | ||
| docker run \ | ||
| -v $(SRC):/src \ | ||
| -v $(PACKAGE_DESTINATION):/pkg \ | ||
| $(CONTAINER_NAME) \ | ||
| sh -c "make package && \ | ||
| mkdir -p /tmp/package && \ | ||
| cp --no-preserve=ownership /mvn/test-target/google-cloud-bigquery-jdbc-*.jar /tmp/package && \ | ||
| rm -f /pkg/*tests.jar && \ | ||
| cp --no-preserve=ownership dependencies.txt /tmp/package && \ | ||
| rm dependencies.txt && \ | ||
| cp --no-preserve=ownership /mvn/test-target/dependency/*.jar /tmp/package && \ | ||
| zip -j -r /pkg/google-cloud-bigquery-jdbc-$$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout).zip /tmp/package" | ||
|
|
||
| docker-unittest: | | ||
| $(MAKE) .docker-run args="make unittest test=$(test)" | ||
|
|
||
| docker-integration-test: .check-env | ||
| $(MAKE) .docker-run args="make integration-test test=$(test) skipSurefire=$(skipSurefire)" | ||
|
|
||
| docker-coverage: | ||
| $(MAKE) .docker-run args="make unit-test-coverage" | ||
| $(MAKE) .docker-run args="make full-coverage" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.