Move examples for Tink C++ to the project's folder

PiperOrigin-RevId: 464756776
ragona · Aug 2, 2022 · 777181d · 777181d
1 parent 2c794f9
commit 777181d
Show file tree

Hide file tree

Showing 44 changed files with 28 additions and 24 deletions.
diff --git a/cc/.bazelignore b/cc/.bazelignore
@@ -1,3 +1,5 @@
 # Ignore AWS-KMS and Cloud KMS integrations which are in thier own WORKSPACEs.
 integration/awskms
 integration/gcpkms
+# Ignore examples.
+examples
diff --git a/examples/cc/.bazelversion → cc/examples/.bazelversion b/examples/cc/.bazelversion → cc/examples/.bazelversion
diff --git a/examples/cc/WORKSPACE → cc/examples/WORKSPACE b/examples/cc/WORKSPACE → cc/examples/WORKSPACE
@@ -19,15 +19,14 @@ workspace(name = "examples_cc")
 
 local_repository(
     name = "tink_cc",
-    path = "../../cc",
+    path = "../",
 )
 # http_archive(
 #     name = "tink_cc",
 #     urls = ["https://github.com/google/tink/archive/master.zip"],
 #     strip_prefix = "tink-master/cc",
 # )
 
-
 # Load Tink dependencies.
 
 load("@tink_cc//:tink_cc_deps.bzl", "tink_cc_deps")

diff --git a/examples/cc/aead/BUILD.bazel → cc/examples/aead/BUILD.bazel b/examples/cc/aead/BUILD.bazel → cc/examples/aead/BUILD.bazel
diff --git a/examples/cc/aead/aead_cli.cc → cc/examples/aead/aead_cli.cc b/examples/cc/aead/aead_cli.cc → cc/examples/aead/aead_cli.cc
diff --git a/examples/cc/aead/aead_cli_test.sh → cc/examples/aead/aead_cli_test.sh b/examples/cc/aead/aead_cli_test.sh → cc/examples/aead/aead_cli_test.sh
diff --git a/examples/cc/aead/aead_test_keyset.json → cc/examples/aead/aead_test_keyset.json b/examples/cc/aead/aead_test_keyset.json → cc/examples/aead/aead_test_keyset.json
diff --git a/examples/cc/digital_signatures/BUILD.bazel → cc/examples/digital_signatures/BUILD.bazel b/examples/cc/digital_signatures/BUILD.bazel → cc/examples/digital_signatures/BUILD.bazel
diff --git a/examples/cc/digital_signatures/README.md → cc/examples/digital_signatures/README.md b/examples/cc/digital_signatures/README.md → cc/examples/digital_signatures/README.md
@@ -13,7 +13,7 @@ obtaining a primitive, and using the primitive to do crypto.
 
 ```shell
 git clone https://github.com/google/tink
-cd tink/examples/cc
+cd tink/cc/examples
 bazel build ...
 echo "a message" > message.txt
 ./bazel-bin/digital_signatures/digital_signatures_cli gen-private-key private_keyset.bin

diff --git a/...ital_signatures/digital_signatures_cli.cc → ...ital_signatures/digital_signatures_cli.cc b/...ital_signatures/digital_signatures_cli.cc → ...ital_signatures/digital_signatures_cli.cc
diff --git a/...signatures/digital_signatures_cli_test.sh → ...signatures/digital_signatures_cli_test.sh b/...signatures/digital_signatures_cli_test.sh → ...signatures/digital_signatures_cli_test.sh
diff --git a/examples/cc/digital_signatures/util.cc → cc/examples/digital_signatures/util.cc b/examples/cc/digital_signatures/util.cc → cc/examples/digital_signatures/util.cc
diff --git a/examples/cc/digital_signatures/util.h → cc/examples/digital_signatures/util.h b/examples/cc/digital_signatures/util.h → cc/examples/digital_signatures/util.h
@@ -14,8 +14,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef EXAMPLES_CC_DIGITAL_SIGNATURES_UTIL_H_
-#define EXAMPLES_CC_DIGITAL_SIGNATURES_UTIL_H_
+#ifndef TINK_EXAMPLES_DIGITAL_SIGNATURES_UTIL_H_
+#define TINK_EXAMPLES_DIGITAL_SIGNATURES_UTIL_H_
 
 #include <fstream>
 #include <iostream>
@@ -60,4 +60,4 @@ class Util {
   static void Write(const std::string& output, const std::string& filename);
 };
 
-#endif  // EXAMPLES_CC_DIGITAL_SIGNATURES_UTIL_H_
+#endif  // TINK_EXAMPLES_DIGITAL_SIGNATURES_UTIL_H_
diff --git a/examples/cc/helloworld/BUILD.bazel → cc/examples/helloworld/BUILD.bazel b/examples/cc/helloworld/BUILD.bazel → cc/examples/helloworld/BUILD.bazel
diff --git a/examples/cc/helloworld/CMakeLists.txt → cc/examples/helloworld/CMakeLists.txt b/examples/cc/helloworld/CMakeLists.txt → cc/examples/helloworld/CMakeLists.txt
diff --git a/...loworld/CMakeLists_for_CMakeBuildTest.txt → ...loworld/CMakeLists_for_CMakeBuildTest.txt b/...loworld/CMakeLists_for_CMakeBuildTest.txt → ...loworld/CMakeLists_for_CMakeBuildTest.txt
diff --git a/examples/cc/helloworld/README.md → cc/examples/helloworld/README.md b/examples/cc/helloworld/README.md → cc/examples/helloworld/README.md
@@ -13,7 +13,7 @@ obtaining a primitive, and using the primitive to do crypto.
 ```shell
 # Build the code.
 git clone https://github.com/google/tink
-cd tink/examples/cc
+cd tink/cc/examples
 bazel build ...
 
 # Create some input.
@@ -45,7 +45,7 @@ cat foo-decrypted.txt
 
 # Clone the Tink repository.
 git clone https://github.com/google/tink
-cd tink/examples/cc/helloworld
+cd tink/cc/examples/helloworld
 
 # Build the hello world example.
 (

diff --git a/...elloworld/aes128_gcm_test_keyset_json.txt → ...elloworld/aes128_gcm_test_keyset_json.txt b/...elloworld/aes128_gcm_test_keyset_json.txt → ...elloworld/aes128_gcm_test_keyset_json.txt
diff --git a/examples/cc/helloworld/cmake_build_test.sh → cc/examples/helloworld/cmake_build_test.sh b/examples/cc/helloworld/cmake_build_test.sh → cc/examples/helloworld/cmake_build_test.sh
@@ -33,7 +33,7 @@ fi
 
 # XDG_CACHE_HOME must be set for a successful build of BoringSSL.
 export XDG_CACHE_HOME="${TEST_TMPDIR}/cache"
-TEST_DATA_DIR="${TEST_SRCDIR}/tink/examples/cc/helloworld"
+TEST_DATA_DIR="${TEST_SRCDIR}/tink/cc/examples/helloworld"
 CMAKE_LISTS_FILE="${TEST_DATA_DIR}/CMakeLists_for_CMakeBuildTest.txt"
 HELLO_WORLD_SRC="${TEST_DATA_DIR}/hello_world.cc"
 KEYSET_FILE="${TEST_DATA_DIR}/aes128_gcm_test_keyset_json.txt"

diff --git a/examples/cc/helloworld/hello_world.cc → cc/examples/helloworld/hello_world.cc b/examples/cc/helloworld/hello_world.cc → cc/examples/helloworld/hello_world.cc
diff --git a/examples/cc/helloworld/hello_world_test.sh → cc/examples/helloworld/hello_world_test.sh b/examples/cc/helloworld/hello_world_test.sh → cc/examples/helloworld/hello_world_test.sh
diff --git a/examples/cc/hybrid_encryption/BUILD.bazel → cc/examples/hybrid_encryption/BUILD.bazel b/examples/cc/hybrid_encryption/BUILD.bazel → cc/examples/hybrid_encryption/BUILD.bazel
@@ -65,7 +65,8 @@ cc_binary(
         "@tink_cc//:keyset_reader",
         "@tink_cc//config:tink_config",
         "@tink_cc//hybrid:hpke_config",
-        "@tink_cc//util:status",    ],
+        "@tink_cc//util:status",
+    ],
 )
 
 sh_test(

diff --git a/examples/cc/hybrid_encryption/README.md → cc/examples/hybrid_encryption/README.md b/examples/cc/hybrid_encryption/README.md → cc/examples/hybrid_encryption/README.md
@@ -13,7 +13,7 @@ obtaining a primitive, and using the primitive to do crypto.
 
 ```shell
 git clone https://github.com/google/tink
-cd tink/examples/cc
+cd tink/cc/examples
 bazel build ...
 echo "a message" > message.txt
 echo "context" > context_info.txt

diff --git a/examples/cc/hybrid_encryption/hybrid_cli.cc → cc/examples/hybrid_encryption/hybrid_cli.cc b/examples/cc/hybrid_encryption/hybrid_cli.cc → cc/examples/hybrid_encryption/hybrid_cli.cc
diff --git a/...s/cc/hybrid_encryption/hybrid_cli_test.sh → ...ples/hybrid_encryption/hybrid_cli_test.sh b/...s/cc/hybrid_encryption/hybrid_cli_test.sh → ...ples/hybrid_encryption/hybrid_cli_test.sh
diff --git a/...ybrid_encryption/hybrid_encryption_cli.cc → ...ybrid_encryption/hybrid_encryption_cli.cc b/...ybrid_encryption/hybrid_encryption_cli.cc → ...ybrid_encryption/hybrid_encryption_cli.cc
diff --git a/..._encryption/hybrid_encryption_cli_test.sh → ..._encryption/hybrid_encryption_cli_test.sh b/..._encryption/hybrid_encryption_cli_test.sh → ..._encryption/hybrid_encryption_cli_test.sh
diff --git a/...ncryption/hybrid_test_private_keyset.json → ...ncryption/hybrid_test_private_keyset.json b/...ncryption/hybrid_test_private_keyset.json → ...ncryption/hybrid_test_private_keyset.json
diff --git a/...encryption/hybrid_test_public_keyset.json → ...encryption/hybrid_test_public_keyset.json b/...encryption/hybrid_test_public_keyset.json → ...encryption/hybrid_test_public_keyset.json
diff --git a/examples/cc/hybrid_encryption/util.cc → cc/examples/hybrid_encryption/util.cc b/examples/cc/hybrid_encryption/util.cc → cc/examples/hybrid_encryption/util.cc
diff --git a/examples/cc/hybrid_encryption/util.h → cc/examples/hybrid_encryption/util.h b/examples/cc/hybrid_encryption/util.h → cc/examples/hybrid_encryption/util.h
@@ -14,8 +14,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef EXAMPLES_CC_HYBRID_ENCRYPTION_UTIL_H_
-#define EXAMPLES_CC_HYBRID_ENCRYPTION_UTIL_H_
+#ifndef TINK_EXAMPLES_HYBRID_ENCRYPTION_UTIL_H_
+#define TINK_EXAMPLES_HYBRID_ENCRYPTION_UTIL_H_
 
 #include <fstream>
 #include <iostream>
@@ -60,4 +60,4 @@ class Util {
   static void Write(const std::string& output, const std::string& filename);
 };
 
-#endif  // EXAMPLES_CC_HYBRID_ENCRYPTION_UTIL_H_
+#endif  // TINK_EXAMPLES_HYBRID_ENCRYPTION_UTIL_H_
diff --git a/examples/cc/jwt/BUILD.bazel → cc/examples/jwt/BUILD.bazel b/examples/cc/jwt/BUILD.bazel → cc/examples/jwt/BUILD.bazel
diff --git a/examples/cc/jwt/README.md → cc/examples/jwt/README.md b/examples/cc/jwt/README.md → cc/examples/jwt/README.md
@@ -12,7 +12,7 @@ obtaining a primitive, and using the primitive to do crypto.
 
 ```shell
 git clone https://github.com/google/tink
-cd tink/examples/cc
+cd tink/cc/examples
 bazel build ...
 ./bazel-bin/jwt/jwt_signature_cli gen-private-key private_keyset.bin
 ./bazel-bin/jwt/jwt_signature_cli get-public-key private_keyset.bin \

diff --git a/examples/cc/jwt/jwt_signature_cli.cc → cc/examples/jwt/jwt_signature_cli.cc b/examples/cc/jwt/jwt_signature_cli.cc → cc/examples/jwt/jwt_signature_cli.cc
diff --git a/examples/cc/jwt/jwt_signature_cli_test.sh → cc/examples/jwt/jwt_signature_cli_test.sh b/examples/cc/jwt/jwt_signature_cli_test.sh → cc/examples/jwt/jwt_signature_cli_test.sh
diff --git a/examples/cc/jwt/util.cc → cc/examples/jwt/util.cc b/examples/cc/jwt/util.cc → cc/examples/jwt/util.cc
diff --git a/examples/cc/jwt/util.h → cc/examples/jwt/util.h b/examples/cc/jwt/util.h → cc/examples/jwt/util.h
@@ -14,8 +14,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef EXAMPLES_CC_JWT_UTIL_H_
-#define EXAMPLES_CC_JWT_UTIL_H_
+#ifndef TINK_EXAMPLES_JWT_UTIL_H_
+#define TINK_EXAMPLES_JWT_UTIL_H_
 
 #include <fstream>
 #include <iostream>
@@ -44,4 +44,4 @@ std::string ReadFile(absl::string_view filename);
 // In case of errors writes a log message and aborts.
 void WriteFile(absl::string_view output, absl::string_view filename);
 
-#endif  // EXAMPLES_CC_JWT_UTIL_H_
+#endif  // TINK_EXAMPLES_JWT_UTIL_H_
diff --git a/examples/cc/mac/BUILD.bazel → cc/examples/mac/BUILD.bazel b/examples/cc/mac/BUILD.bazel → cc/examples/mac/BUILD.bazel
diff --git a/examples/cc/mac/mac_cli.cc → cc/examples/mac/mac_cli.cc b/examples/cc/mac/mac_cli.cc → cc/examples/mac/mac_cli.cc
diff --git a/examples/cc/mac/mac_cli_test.sh → cc/examples/mac/mac_cli_test.sh b/examples/cc/mac/mac_cli_test.sh → cc/examples/mac/mac_cli_test.sh
diff --git a/examples/cc/mac/mac_test_keyset.json → cc/examples/mac/mac_test_keyset.json b/examples/cc/mac/mac_test_keyset.json → cc/examples/mac/mac_test_keyset.json
diff --git a/...r_language/examples/cc/cmake/run_tests.sh → ...r_language/cc/examples/cmake/run_tests.sh b/...r_language/examples/cc/cmake/run_tests.sh → ...r_language/cc/examples/cmake/run_tests.sh
@@ -22,5 +22,5 @@ fi
 
 export TEST_TMPDIR="$(mktemp -dt examples-cc-cmake.XXXXXX)"
 export TEST_SRCDIR="$(cd ..; pwd)"
-cd examples/cc/helloworld
+cd cc/examples/helloworld
 ./cmake_build_test.sh
diff --git a/...ge/examples/cc/cmake_openssl/run_tests.sh → ...ge/cc/examples/cmake_openssl/run_tests.sh b/...ge/examples/cc/cmake_openssl/run_tests.sh → ...ge/cc/examples/cmake_openssl/run_tests.sh
@@ -24,7 +24,9 @@ fi
 # Only installing CMake; OpenSSL is installed by the example script.
 source ./kokoro/testutils/install_cmake.sh
 
-export TEST_TMPDIR="$(mktemp -dt examples-cc-cmake-openssl.XXXXXX)"
-export TEST_SRCDIR="$(cd ..; pwd)"
-cd examples/cc/helloworld
-./cmake_build_test.sh --openssl
+(
+  export TEST_TMPDIR="$(mktemp -dt examples-cc-cmake-openssl.XXXXXX)"
+  export TEST_SRCDIR="$(cd ..; pwd)"
+  cd cc/examples/helloworld
+  ./cmake_build_test.sh --openssl
+)
diff --git a/kokoro/run_tests.sh b/kokoro/run_tests.sh
@@ -76,7 +76,7 @@ run_all_linux_tests() {
   fi
 
   run_linux_tests "javascript"
-  run_linux_tests "examples/cc"
+  run_linux_tests "cc/examples"
 
   local -a MANUAL_EXAMPLE_JAVA_TARGETS
   if [[ -n "${KOKORO_ROOT}" ]]; then