Skip to content

Commit

Permalink
fix: cmek verify fixes
Browse files Browse the repository at this point in the history
- ignore method additions to protobufs, external users dont implement them
- add missing copyright header

Change-Id: I2330400c144ce80e05ff1af3e5dc031f8a21aa37
  • Loading branch information
igorbernstein2 committed Sep 30, 2020
1 parent 3a73574 commit a395f86
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.cloud.bigtable.admin.v2.it;

import static com.google.common.truth.Truth.assertThat;
Expand Down Expand Up @@ -33,8 +48,6 @@

@RunWith(JUnit4.class)
public class BigtableCmekIT {
private static Logger LOG = Logger.getLogger(BigtableCmekIT.class.getName());

private static final String CMEK_KMS_KEY_PROPERTY_NAME = "bigtable.kms_key_name";

@ClassRule public static TestEnvRule testEnvRule = new TestEnvRule();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<!-- Adding method to interfaces is safe for autogenerated protobufs -->
<difference>
<differenceType>7012</differenceType>
<className>com/google/bigtable/admin/v2/TableOrBuilder</className>
<method>*Restore*</method>
<className>**</className>
<method>*</method>
</difference>
</differences>
10 changes: 10 additions & 0 deletions proto-google-cloud-bigtable-v2/clirr-ignored-differences.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
<differences>
<!-- Adding method to interfaces is safe for autogenerated protobufs -->
<difference>
<differenceType>7012</differenceType>
<className>**</className>
<method>*</method>
</difference>
</differences>

0 comments on commit a395f86

Please sign in to comment.