Skip to content

Commit e253889

Browse files
committed
Cleanup of unwanted stuff
Signed-off-by: Nishidha Panpaliya <nishidha.panpaliya@partner.ibm.com>
1 parent 1da774e commit e253889

File tree

5 files changed

+8
-33
lines changed

5 files changed

+8
-33
lines changed

aws/security_plugins/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
/*****************************************************************************
1+
*****************************************************************************
22
* README for AWS Security Plugin
3-
*
3+
44
* Last Update: January 2024
5-
*
5+
66
* Security plugins, in general can be used to replace or extend the
77
* mechanisms that DB2 uses to authenticate users and obtain their
88
* group memberships. This AWS IAM security plugin is designed to authenticate
99
* AWS Cognito users using ACCESSTOKEN to connect to Db2.
10-
*
10+
1111
* For information on developing, building and deploying this security plugin,
1212
* see the [README](db2-aws-iam/README.md). Refer [`AWS_cognito.md`](AWS_cognito.md)
1313
* to know one can setup AWS cognito, create users and groups, and retrieve token to be

aws/security_plugins/db2-aws-iam/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# Use Db2U RHEL8 base image as the base docker image
2-
# FROM us.icr.io/db2oncloud_dev/db2u.base@sha256:40d23c50c5a68d8490cee3634693e6e2a0735234b5c0ca75ce1d37c057cbbd4e
2+
33
FROM ibmcom/db2
4-
LABEL description="IBM Db2 AWS IAM Security Plugin"
5-
LABEL maintainers.author1="Andrew Hilden"
4+
LABEL description="AWS Db2 AWS IAM Security Plugin"
65

76
ARG OPENSSL_VER=1
87
ENV OPENSSL_VER=$OPENSSL_VER
@@ -16,7 +15,7 @@ RUN echo "jenk ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
1615

1716
# Build the source code
1817
# RUN ./build
19-
WORKDIR /tmp/
18+
2019
WORKDIR /mnt/blumeta0/db2_config/
2120
COPY src/gss/users.json /mnt/blumeta0/db2_config/
2221
RUN chmod -R u+rwX,go+rwX /mnt/blumeta0/

aws/security_plugins/db2-aws-iam/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ docker exec -ti mydb2 bash
116116
sudo cp /usr/local/lib64/libaws-cpp-sdk-cognito-idp.so /opt/ibm/db2/V11.5/lib64/awssdk/RHEL/8.1/
117117
```
118118
119-
Create symlinks for above library in /opt/ibm/db2/V11.5/lib64/
119+
Create symlink for above library in /opt/ibm/db2/V11.5/lib64/
120120
```shell
121121
cd /opt/ibm/db2/V11.5/lib64
122122
sudo ln -s awssdk/RHEL/8.1/libaws-cpp-sdk-cognito-idp.so libaws-cpp-sdk-cognito-idp.so

aws/security_plugins/db2-aws-iam/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ OPENSSL_VER=$1
44
# Install the dependent packages
55
sh $PWD/install_packages.sh $OPENSSL_VER
66

7-
export INSTALLED_OPENSSL=$(openssl version | awk '{print $2}' | sed -e 's/[a-z]-*.*//' | awk -F. '{ print $1$2$3 }')
8-
9-
export INSTALLED_JSON_C=$(yum info installed json-c | grep Version | sed -e 's/Version\s*: //g' | awk -F. '{ print $1$2$3 }')
10-
117
sh $PWD/build_aws_sdk.sh $OPENSSL_VER
128

139
make clean && make

aws/security_plugins/db2-aws-iam/src/Makefile

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ _dummy := $(shell mkdir -p $(OUTPUTDIR))
3737
_dummy := $(shell mkdir -p $(PLUGINDIR)/server)
3838
_dummy := $(shell mkdir -p $(PLUGINDIR)/client)
3939
_dummy := $(shell mkdir -p $(PLUGINDIR)/group)
40-
#_dummy := $(shell chown -R bin:bin $(PLUGINDIR))
41-
4240

4341
.DEFAULT_GOAL := all
4442

@@ -166,24 +164,6 @@ tail:
166164
tailf ~/sqllib/db2dump/db2diag.log | grep AWSIAMauth
167165

168166

169-
$(TEST_DIR)/unit_apikey.o: $(TEST_DIR)/unit_apikey.cpp
170-
g++ $(CFLAGS) $(LIBS) -c -o $@ $<
171-
172-
173-
# Command line example
174-
$(TEST_DIR)/unit-main.o: $(TEST_DIR)/unit_main.cpp
175-
g++ $(CFLAGS) $(LIBS) -c -o $@ $<
176-
177-
178-
$(TEST_DIR)/unit_test_apikey: $(TEST_DIR)/unit-main.o $(TEST_DIR)/unit_apikey.o
179-
g++ $(CFLAGS) $(LIBS) -o $@ $(TEST_DIR)/unit-main.o $(TEST_DIR)/unit_apikey.o ${GSSAPI_SERVER_MODULE}
180-
181-
unit_test: $(UNIT_TEST)
182-
./test/$(UNIT_TEST)
183-
184-
$(UNIT_TEST): $(UNIT_OBJ) $(GSSAPI_OBJ)
185-
$(CXX) -g $(CFLAGS) $^ $(LIBS) -o $@
186-
187167
.PHONY: cleanum
188168
DB2PATH = $(HOME)/sqllib
189169
ERASE = rm -f

0 commit comments

Comments
 (0)