Skip to content

Add support for custom static headers #2690

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

Merged
vam-google merged 15 commits into from
Dec 14, 2017
Merged

Add support for custom static headers #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
15f164a
Add support for custom static headers
vam-google Dec 8, 2017
cf6610e
Address codacy-bot feedback and initial feedback comment
vam-google Dec 8, 2017
5129a68
remove extractHeader method from GrpcSpannerRpc
vam-google Dec 8, 2017
b6b1413
Minor spanner fixes
vam-google Dec 8, 2017
54759a2
Address Spanner PR feedback
vam-google Dec 9, 2017
4fa1a78
Merge remote-tracking branch 'upstream/master'
vam-google Dec 12, 2017
7d99714
Add support internal headers validation in generated tests only.
vam-google Dec 12, 2017
28c9c1b
Address spanner PR feedback
vam-google Dec 13, 2017
ab0601f
Merge remote-tracking branch 'upstream/master'
vam-google Dec 13, 2017
59af7b9
Fix for firestore
vam-google Dec 13, 2017
1c43bc6
Address PR feedback, fix logging headers
vam-google Dec 13, 2017
9f86cf5
Fix comment
vam-google Dec 13, 2017
21c0fb8
Fix comment
vam-google Dec 13, 2017
88008d6
Integrate with latest gax-java PR feedback changes
vam-google Dec 14, 2017
0a98718
Bump dependencies versions:
vam-google Dec 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions google-cloud-bigquery/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</parent>
<properties>
<site.installationModule>google-cloud-bigquery</site.installationModule>
<artifact.version>${project.version}</artifact.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -71,15 +70,6 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>./..</directory>
<filtering>true</filtering>
<includes>
<include>project.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<!-- Allow script to run, so we can run benchmarks. -->
Expand All @@ -89,25 +79,6 @@
<cleanupDaemonThreads>false</cleanupDaemonThreads>
<skip>false</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<copy file="${project.build.outputDirectory}/project.properties"
toFile="${project.build.outputDirectory}/com/google/cloud/bigquery/project.properties"
overwrite="true" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
28 changes: 0 additions & 28 deletions google-cloud-bigquerydatatransfer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,35 +102,7 @@
</profile>
</profiles>
<build>
<resources>
<resource>
<directory>./..</directory>
<filtering>true</filtering>
<includes>
<include>project.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<copy file="${project.build.outputDirectory}/project.properties"
toFile="${project.build.outputDirectory}/com/google/cloud/bigquerydatatransfer/project.properties"
overwrite="true" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
30 changes: 6 additions & 24 deletions .../src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferServiceSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.core.PropertiesProvider;
import com.google.api.gax.grpc.GrpcExtraHeaderData;
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
Expand Down Expand Up @@ -92,15 +92,6 @@ public class DataTransferServiceSettings extends ClientSettings<DataTransferServ
.add("https://www.googleapis.com/auth/cloud-platform.read-only")
.build();

private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private static final String PROPERTIES_FILE =
"/com/google/cloud/bigquery/datatransfer/project.properties";
private static final String META_VERSION_KEY = "artifact.version";

private static String gapicVersion;

private final UnaryCallSettings<GetDataSourceRequest, DataSource> getDataSourceSettings;
private final PagedCallSettings<
ListDataSourcesRequest, ListDataSourcesResponse, ListDataSourcesPagedResponse>
Expand Down Expand Up @@ -249,19 +240,10 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setApiClientHeaderLineKey("x-goog-api-client")
.addApiClientHeaderLineData(GrpcExtraHeaderData.getXGoogApiClientData());
}

private static String getGapicVersion() {
if (gapicVersion == null) {
gapicVersion =
PropertiesProvider.loadProperty(
DataTransferServiceSettings.class, PROPERTIES_FILE, META_VERSION_KEY);
gapicVersion = gapicVersion == null ? DEFAULT_GAPIC_VERSION : gapicVersion;
}
return gapicVersion;
.setGeneratedLibToken(
"gapic", GaxProperties.getLibraryVersion(DataTransferServiceSettings.class))
.setTransportToken(
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
}

/** Returns a new builder for this class. */
Expand Down
29 changes: 0 additions & 29 deletions google-cloud-bigtable/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
</parent>
<properties>
<site.installationModule>google-cloud-bigtable</site.installationModule>
<artifact.version>${project.version}</artifact.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -107,35 +106,7 @@
</profile>
</profiles>
<build>
<resources>
<resource>
<directory>./..</directory>
<filtering>true</filtering>
<includes>
<include>project.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<tasks>
<copy file="${project.build.outputDirectory}/project.properties"
toFile="${project.build.outputDirectory}/com/google/cloud/bigtable/project.properties"
overwrite="true" />
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
Expand Down
32 changes: 7 additions & 25 deletions ...table/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableInstanceAdminSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.core.PropertiesProvider;
import com.google.api.gax.grpc.GrpcExtraHeaderData;
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.grpc.ProtoOperationTransformers;
Expand Down Expand Up @@ -105,15 +105,6 @@ public class BigtableInstanceAdminSettings extends ClientSettings<BigtableInstan
.add("https://www.googleapis.com/auth/cloud-platform.read-only")
.build();

private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private static final String PROPERTIES_FILE =
"/com/google/cloud/bigtable/admin/project.properties";
private static final String META_VERSION_KEY = "artifact.version";

private static String gapicVersion;

private final UnaryCallSettings<CreateInstanceRequest, Operation> createInstanceSettings;
private final OperationCallSettings<CreateInstanceRequest, Instance, CreateInstanceMetadata>
createInstanceOperationSettings;
Expand Down Expand Up @@ -244,19 +235,10 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setApiClientHeaderLineKey("x-goog-api-client")
.addApiClientHeaderLineData(GrpcExtraHeaderData.getXGoogApiClientData());
}

private static String getGapicVersion() {
if (gapicVersion == null) {
gapicVersion =
PropertiesProvider.loadProperty(
BigtableInstanceAdminSettings.class, PROPERTIES_FILE, META_VERSION_KEY);
gapicVersion = gapicVersion == null ? DEFAULT_GAPIC_VERSION : gapicVersion;
}
return gapicVersion;
.setGeneratedLibToken(
"gapic", GaxProperties.getLibraryVersion(BigtableInstanceAdminSettings.class))
.setTransportToken(
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
}

/** Returns a new builder for this class. */
Expand Down Expand Up @@ -408,7 +390,7 @@ private static Builder createDefault() {
Builder builder = new Builder((ClientContext) null);
builder.setTransportChannelProvider(defaultTransportChannelProvider());
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
return initDefaults(builder);
}
Expand Down
32 changes: 7 additions & 25 deletions ...bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BigtableTableAdminSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.core.PropertiesProvider;
import com.google.api.gax.grpc.GrpcExtraHeaderData;
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
Expand Down Expand Up @@ -102,15 +102,6 @@ public class BigtableTableAdminSettings extends ClientSettings<BigtableTableAdmi
.add("https://www.googleapis.com/auth/cloud-platform.read-only")
.build();

private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private static final String PROPERTIES_FILE =
"/com/google/cloud/bigtable/admin/project.properties";
private static final String META_VERSION_KEY = "artifact.version";

private static String gapicVersion;

private final UnaryCallSettings<CreateTableRequest, Table> createTableSettings;
private final PagedCallSettings<ListTablesRequest, ListTablesResponse, ListTablesPagedResponse>
listTablesSettings;
Expand Down Expand Up @@ -194,19 +185,10 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setApiClientHeaderLineKey("x-goog-api-client")
.addApiClientHeaderLineData(GrpcExtraHeaderData.getXGoogApiClientData());
}

private static String getGapicVersion() {
if (gapicVersion == null) {
gapicVersion =
PropertiesProvider.loadProperty(
BigtableTableAdminSettings.class, PROPERTIES_FILE, META_VERSION_KEY);
gapicVersion = gapicVersion == null ? DEFAULT_GAPIC_VERSION : gapicVersion;
}
return gapicVersion;
.setGeneratedLibToken(
"gapic", GaxProperties.getLibraryVersion(BigtableTableAdminSettings.class))
.setTransportToken(
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
}

/** Returns a new builder for this class. */
Expand Down Expand Up @@ -371,7 +353,7 @@ private static Builder createDefault() {
Builder builder = new Builder((ClientContext) null);
builder.setTransportChannelProvider(defaultTransportChannelProvider());
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
return initDefaults(builder);
}
Expand Down
30 changes: 6 additions & 24 deletions google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/v2/BigtableSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

import com.google.api.core.ApiFunction;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.core.PropertiesProvider;
import com.google.api.gax.grpc.GrpcExtraHeaderData;
import com.google.api.gax.grpc.GaxGrpcProperties;
import com.google.api.gax.grpc.GrpcTransportChannel;
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
import com.google.api.gax.retrying.RetrySettings;
Expand Down Expand Up @@ -94,14 +94,6 @@ public class BigtableSettings extends ClientSettings<BigtableSettings> {
.add("https://www.googleapis.com/auth/cloud-platform.read-only")
.build();

private static final String DEFAULT_GAPIC_NAME = "gapic";
private static final String DEFAULT_GAPIC_VERSION = "";

private static final String PROPERTIES_FILE = "/com/google/cloud/bigtable/project.properties";
private static final String META_VERSION_KEY = "artifact.version";

private static String gapicVersion;

private final StreamingCallSettings<ReadRowsRequest, ReadRowsResponse> readRowsSettings;
private final StreamingCallSettings<SampleRowKeysRequest, SampleRowKeysResponse>
sampleRowKeysSettings;
Expand Down Expand Up @@ -189,19 +181,9 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
return ApiClientHeaderProvider.newBuilder()
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
.setApiClientHeaderLineKey("x-goog-api-client")
.addApiClientHeaderLineData(GrpcExtraHeaderData.getXGoogApiClientData());
}

private static String getGapicVersion() {
if (gapicVersion == null) {
gapicVersion =
PropertiesProvider.loadProperty(
BigtableSettings.class, PROPERTIES_FILE, META_VERSION_KEY);
gapicVersion = gapicVersion == null ? DEFAULT_GAPIC_VERSION : gapicVersion;
}
return gapicVersion;
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(BigtableSettings.class))
.setTransportToken(
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
}

/** Returns a new builder for this class. */
Expand Down Expand Up @@ -309,7 +291,7 @@ private static Builder createDefault() {
Builder builder = new Builder((ClientContext) null);
builder.setTransportChannelProvider(defaultTransportChannelProvider());
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
return initDefaults(builder);
}
Expand Down
Loading