Merge pull request #84 from aws/support_for_aws_attach

Added new contracts for credentialsfetcher

CMakeLists.txt

@@ -24,6 +24,10 @@ foreach(VAR IN LISTS DISTRO)
   message(STATUS "${VAR}=`${${VAR}}`")
 endforeach()
 
+if((${DISTRO_ID} MATCHES "amzn"))
+    add_definitions(-DAMAZON_LINUX_DISTRO=1)
+endif()
+
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
 set(config)
@@ -60,7 +64,8 @@ endif()
 configure_file(${CMAKE_SOURCE_DIR}/config/config.h.in
     ${CMAKE_BINARY_DIR}/config.h @ONLY)
 
-if((${DISTRO_ID} MATCHES "Amazon Linux") OR (${DISTRO_ID} MATCHES "ubuntu"))
+
+if((${DISTRO_ID} MATCHES "amzn") OR (${DISTRO_ID} MATCHES "ubuntu"))
   file(WRITE scripts/systemd/credentials-fetcher.service
     "[Unit]\n"
     "Description=credentials-fetcher systemd service unit file.\n\n"
@@ -159,6 +164,9 @@ install(FILES ${CMAKE_BINARY_DIR}/credentials_fetcher_utf16_private.exe
 install(FILES ${CMAKE_BINARY_DIR}/credentials_fetcher_utf16_private.runtimeconfig.json
         DESTINATION "/usr/sbin/"
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
+install(FILES ${CMAKE_BINARY_DIR}/krb5.conf
+        DESTINATION "/usr/sbin/"
+        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
 
 enable_testing()
 

api/CMakeLists.txt

@@ -7,11 +7,14 @@ FILE(GLOB SRC_FILES src/*.cpp)
 get_filename_component(credentialsfetcher_proto "../protos/credentialsfetcher.proto" ABSOLUTE)
 get_filename_component(credentialsfetcher_proto_path "${credentialsfetcher_proto}" PATH)
 message(${credentialsfetcher_proto})
+set(AWSSDK_INSTALL_LIBDIR /usr/lib64)
 
+set(SERVICE_COMPONENTS s3 secretsmanager)
 set(credentialsfetcher_proto_sources "${CMAKE_CURRENT_BINARY_DIR}/credentialsfetcher.pb.cc")
 set(credentialsfetcher_proto_headers "${CMAKE_CURRENT_BINARY_DIR}/credentialsfetcher.pb.h")
 set(credentialsfetcher_grpc_sources "${CMAKE_CURRENT_BINARY_DIR}/credentialsfetcher.grpc.pb.cc")
 set(credentialsfetcher_grpc_headers "${CMAKE_CURRENT_BINARY_DIR}/credentialsfetcher.grpc.pb.h")
+find_package(AWSSDK REQUIRED COMPONENTS ${SERVICE_COMPONENTS})
 add_custom_command(
         OUTPUT "${credentialsfetcher_proto_sources}" "${credentialsfetcher_proto_headers}" "${credentialsfetcher_grpc_sources}" "${credentialsfetcher_grpc_headers}"
         COMMAND ${_PROTOBUF_PROTOC}
@@ -73,7 +76,7 @@ else()
         glib-2.0
         jsoncpp
         krb5 kadm5srv_mit kdb5 gssrpc gssapi_krb5 gssrpc k5crypto
-        com_err krb5support resolv)
+        com_err krb5support resolv ${AWSSDK_LINK_LIBRARIES})
 endif()
 
 enable_testing()

api/tests/CMakeLists.txt

@@ -22,4 +22,4 @@ check_pie_supported()
 if (CMAKE_C_LINK_PIE_SUPPORTED)
     set_property(TARGET gmsa_test_client
                 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-endif ()
+endif ()