From f9a44a69c35dcf7f1c0f42e1ae9971bae0148099 Mon Sep 17 00:00:00 2001
From: Brennan Saeta <saeta@google.com>
Date: Wed, 13 Jun 2018 18:05:39 -0700
Subject: [PATCH] Update the docs and api_def.

---
 tensorflow/contrib/cloud/ops/gcs_config_ops.cc     | 42 ++--------------------
 .../base_api/api_def_GcsConfigureBlockCache.pbtxt  |  9 +++++
 .../base_api/api_def_GcsConfigureCredentials.pbtxt | 33 +++++++++++++++++
 3 files changed, 44 insertions(+), 40 deletions(-)
 create mode 100644 tensorflow/core/api_def/base_api/api_def_GcsConfigureBlockCache.pbtxt
 create mode 100644 tensorflow/core/api_def/base_api/api_def_GcsConfigureCredentials.pbtxt

diff --git a/tensorflow/contrib/cloud/ops/gcs_config_ops.cc b/tensorflow/contrib/cloud/ops/gcs_config_ops.cc
index 9cf85f5..5e31a15 100644
--- a/tensorflow/contrib/cloud/ops/gcs_config_ops.cc
+++ b/tensorflow/contrib/cloud/ops/gcs_config_ops.cc
@@ -21,50 +21,12 @@ namespace tensorflow {
 
 REGISTER_OP("GcsConfigureCredentials")
     .Input("json: string")
-    .SetShapeFn(shape_inference::NoOutputs)
-    .Doc(R"doc(
-Configures the credentials used by the GCS client of the local TF runtime.
-
-The json input can be of the format:
-
-1. Refresh Token:
-{
-  "client_id": "<redacted>",
-  "client_secret": "<redacted>",
-  "refresh_token: "<redacted>",
-  "type": "authorized_user",
-}
-
-2. Service Account:
-{
-  "type": "service_account",
-  "project_id": "<redacted>",
-  "private_key_id": "<redacted>",
-  "private_key": "------BEGIN PRIVATE KEY-----\n<REDACTED>\n-----END PRIVATE KEY------\n",
-  "client_email": "<REDACTED>@<REDACTED>.iam.gserviceaccount.com",
-  "client_id": "<REDACTED>",
-  # Some additional fields elided
-}
-
-Note the credentials established through this method are shared across all
-sessions run on this runtime.
-
-Note be sure to feed the inputs to this op to ensure the credentials are not
-stored in a constant op within the graph that might accidentally be checkpointed
-or in other ways be persisted or exfiltrated.
-)doc");
+    .SetShapeFn(shape_inference::NoOutputs);
 
 REGISTER_OP("GcsConfigureBlockCache")
     .Input("max_cache_size: uint64")
     .Input("block_size: uint64")
     .Input("max_staleness: uint64")
-    .SetShapeFn(shape_inference::NoOutputs)
-    .Doc(R"doc(
-Re-configures the GCS block cache with the new configuration values.
-
-If the values are the same as already configured values, this op is a no-op. If
-they are different, the current contents of the block cache is dropped, and a
-new block cache is created fresh.
-)doc");
+    .SetShapeFn(shape_inference::NoOutputs);
 
 }  // namespace tensorflow
diff --git a/tensorflow/core/api_def/base_api/api_def_GcsConfigureBlockCache.pbtxt b/tensorflow/core/api_def/base_api/api_def_GcsConfigureBlockCache.pbtxt
new file mode 100644
index 0000000..9d32940
--- /dev/null
+++ b/tensorflow/core/api_def/base_api/api_def_GcsConfigureBlockCache.pbtxt
@@ -0,0 +1,9 @@
+op {
+  graph_op_name: "GcsConfigureBlockCache"
+  summary: "Re-configures the GCS block cache with the new configuration values."
+  description: <<END
+If the values are the same as already configured values, this op is a no-op. If
+they are different, the current contents of the block cache is dropped, and a
+new block cache is created fresh.
+END
+}
diff --git a/tensorflow/core/api_def/base_api/api_def_GcsConfigureCredentials.pbtxt b/tensorflow/core/api_def/base_api/api_def_GcsConfigureCredentials.pbtxt
new file mode 100644
index 0000000..786022a
--- /dev/null
+++ b/tensorflow/core/api_def/base_api/api_def_GcsConfigureCredentials.pbtxt
@@ -0,0 +1,33 @@
+op {
+  graph_op_name: "GcsConfigureCredentials"
+  summary: "Configures the credentials used by the GCS client of the local TF runtime."
+  description: <<END0
+The json input can be of the format:
+
+1. Refresh Token:
+{
+  "client_id": "<redacted>",
+  "client_secret": "<redacted>",
+  "refresh_token: "<redacted>",
+  "type": "authorized_user",
+}
+
+2. Service Account:
+{
+  "type": "service_account",
+  "project_id": "<redacted>",
+  "private_key_id": "<redacted>",
+  "private_key": "------BEGIN PRIVATE KEY-----\n<REDACTED>\n-----END PRIVATE KEY------\n",
+  "client_email": "<REDACTED>@<REDACTED>.iam.gserviceaccount.com",
+  "client_id": "<REDACTED>",
+  # Some additional fields elided
+}
+
+Note the credentials established through this method are shared across all
+sessions run on this runtime.
+
+Note be sure to feed the inputs to this op to ensure the credentials are not
+stored in a constant op within the graph that might accidentally be checkpointed
+or in other ways be persisted or exfiltrated.
+END0
+}
-- 
2.7.4