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

Merge master to spanner-gapic-migration #3330

Merged

Conversation

yihanzhen
Copy link
Contributor

No description provided.

Frank Natividad and others added 30 commits April 26, 2018 10:07
Add update ACLs sample. Add update dataset expiration sample.
BigQuery: Add "managing datasets" snippets.
…aging (second part) (googleapis#3251)

1) Radically change the structure of the repo. Now the root `pom.xml` file is not deployed to maven and is not a parent pom for any of the other modules, but is simply an aggregator pom, which aggregates other mostly independent of each other modules.
2) Update proto and grpc artifact to the latest generated versions as of time of this PR.
3) Add `cloudiot-v1` and `websecurityscanner-v1alpha` proto and grp artifacts (not released yet even in api-client-staging). Note, gapic clients for this apis are not added yet.
4) Rename `google-cloud-pom` parent artifact (for manual and gapic clients) to `google-cloud-clients`.
5) Move all manual and gapic clients from root directory to `google-cloud-clients` sub directory.
6) Make `google-cloud-bom` not a child of `google-cloud-clients` (former `google-cloud-pom`) anymore, keep it on root level so it becomes a sibling of `google-cloud-clients` (module which used to be its parent).
7) Similarly make `google-cloud-examples`, `google-cloud-testing` and `google-cloud-util` not children of `google-cloud-clients` and keep them on root level. Make these three modules also excluded from maven deployment (they will not be published to maven anymore).

After this PR is done, additional work is required to fix circleci individual IT tests runs (should be trivial). Also deployment and documentation scripts must be modified accordingly (will be done right after pushing this PR).
Proto- and grpc- packages have moved to this repository.
When we run integration on CI, we must build them, otherwise the
tasks will fail from not being able to find dependencies.
We need to update the script since the clients moved.
shollyman and others added 16 commits May 22, 2018 13:03
BigQuery: add missing query statistics.
instead of deprecated fields.

Original PR: googleapis#2989
Test asserts consistent values for all rows within a table, but the
sample data used for generating tables was inconsistent between rows.
The version bump will be picked up by the next release.
We'll hold off on the README update until then.
* Regenerate proto, grpc and gapic clients.

* revert pubsub version changes - which will be picked up by version bump script during release

* revert more version changes
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@googlebot googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Jun 1, 2018
@pongad
Copy link
Contributor

pongad commented Jun 1, 2018

This is failing due to a missing class. @hzyi-google Do you know what's going on?

@yihanzhen
Copy link
Contributor Author

yihanzhen commented Jun 1, 2018

@pongad It seems that gax 1.26 and above is forcing api-common 1.6, while api-common 1.6 removed ResourceNameType and thus broke bigtable. Anything I can do to work around that?

@garrettjonesgoogle
Copy link
Member

@andreamlin is working on that

neozwu and others added 3 commits June 1, 2018 10:55
* update gax deps to latest

* remove ResourceNameType, update api-common to 1.6, update jsr to 3.0.2

* regenerate grpc/proto packages using new protoc-gapic-p:
@yihanzhen
Copy link
Contributor Author

PTAL

@pongad
Copy link
Contributor

pongad commented Jun 4, 2018

LGTM

@yihanzhen yihanzhen merged commit 0a3e3e7 into googleapis:spanner-gapic-migration Jun 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: no This human has *not* signed the Contributor License Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.