From: Mandar Sawant <ms5838@att.com>
Date: Wed, 20 Nov 2019 21:20:20 +0000 (+0000)
Subject: Merge "authorization check for more Kafka operations"
X-Git-Tag: 1.0.3~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fkafka11aaf.git;a=commitdiff_plain;h=d1118202d8eb04babd7fa1151a5d01d85c6e93dd;hp=4b6939e390bcc7d1f80839ce2dacf4459f1327ce

Merge "authorization check for more Kafka operations"
---

diff --git a/INFO.yaml b/INFO.yaml
index 4a9b3c6..5e74ffa 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -28,16 +28,7 @@ meetings:
       repeats: 'weekly'
       time: '13:00 UTC'
 repositories:
-    - 'dmaap-buscontroller'
-    - 'dmaap-datarouter'
-    - 'dmaap-dbcapi'
-    - 'dmaap-kafka11aaf'
-    - 'dmaap-messagerouter-dmaapclient'
-    - 'dmaap-messagerouter-messageservice'
-    - 'dmaap-messagerouter-mirroragent'
-    - 'dmaap-messagerouter-msgrtr'
-    - 'dmaap-oom'
-    - 'dmaap-zookeeper'
+    - 'dmaap/kafka11aaf'
 committers:
     - <<: *onap_releng_ptl
     - name: 'Mandar Sawant'
@@ -60,11 +51,6 @@ committers:
       company: 'ATT'
       id: 'su622b'
       timezone: 'America/Louisville'
-    - name: 'Conor Ward'
-      email: 'conor.ward@ericsson.com'
-      company: 'ericsson'
-      id: 'econwar'
-      timezone: 'Europe/Dublin'
     - name: 'Fiachra Corcoran'
       email: 'fiachra.corcoran@est.tech'
       company: 'ericsson'
@@ -75,7 +61,13 @@ tsc:
     changes:
         - type: 'Removal'
           name: 'Habib Madani'
+        - type: 'Removal'
           name: 'Xinhui Li'
+        - type: 'Removal'
           name: 'Jing Wang'
+        - type: 'Removal'
           name: 'Ramdas Sawant'
+        - type: 'Removal'
           name: 'Varun Gudisena'
+        - type: 'Removal'
+          name: 'Conor Ward'
diff --git a/pom.xml b/pom.xml
index 14bfd43..d9254bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,16 @@
 	</developers>
 
 	<build>
+		<!-- Copy files to docker-stage to be included in image -->
+        	<resources>
+            		<resource>
+                		<targetPath>${basedir}/target/docker-stage</targetPath>
+                		<directory>${basedir}/src/main/docker</directory>
+                    			<includes>
+                        			<include>*</include>
+                    			</includes>
+            		</resource>
+        	</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -150,96 +160,30 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<configuration>
-					<imageName>onap/dmaap/kafka111</imageName>
-					<dockerDirectory>src/main/docker</dockerDirectory>
-					<serverId>docker-hub</serverId>
-					<imageTags>
-						<imageTag>${dockertag1}</imageTag>
-						<imageTag>${dockertag2}</imageTag>
-					</imageTags>
-					<resources>
-						<!-- <resource> <targetPath>/</targetPath> <directory>${dockerLocation}</directory> 
-							<include>${project.build.finalName}.jar</include> </resource> -->
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>**/**</include>
-						</resource>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>dmaapMMAgent.jar</include>
-						</resource>
-					</resources>
-				</configuration>
-				<executions>
-					<execution>
-						<id>build-image</id>
-						<phase>install</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-						<configuration>
-							<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>tag-image-project-version</id>
-						<phase>install</phase>
-						<goals>
-							<goal>tag</goal>
-						</goals>
-						<configuration>
-							<image>onap/dmaap/kafka111</image>
-							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>tag-image-latest</id>
-						<phase>install</phase>
-						<goals>
-							<goal>tag</goal>
-						</goals>
-						<configuration>
-							<image>onap/dmaap/kafka111</image>
-							<newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>push</goal>
-						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image-latest</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>push</goal>
-						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
-					</execution>
-				</executions>
+				<artifactId>maven-resources-plugin</artifactId>
+		                  	<version>2.7</version>
+                		  	<executions>
+		                     		<execution>
+                		          		<id>copy-jar</id>
+		                          		<phase>install</phase>
+                		          		<goals>
+		                              			<goal>copy-resources</goal>
+                		          		</goals>
+		                          		<configuration>
+                		              			<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+		                              			<resources>
+		                                  			<resource>
+		                                      				<directory>${basedir}/target</directory>
+		                                      				<includes>
+		                                          				<include>dmaapMMAgent.jar</include>
+		                                          				<include>kafka11aaf-jar-with-dependencies.jar</include>
+		                                      				</includes>
+		                                  			</resource>
+		                              			</resources>
+		                          		</configuration>
+		                      		</execution>
+		                  </executions>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -383,10 +327,52 @@
 							</execution>
 						</executions>
 					</plugin>
+					<!-- build docker image -->
+                    			<plugin>
+			                	<groupId>io.fabric8</groupId>
+			                      	<artifactId>docker-maven-plugin</artifactId>
+			                      	<version>0.28.0</version>
+				              	<configuration>
+			                        	<verbose>${docker.verbose}</verbose>
+			                          	<apiVersion>${docker.apiVersion}</apiVersion>
+			                          	<pullRegistry>${docker.pull.registry}</pullRegistry>
+                        			  	<pushRegistry>${docker.push.registry}</pushRegistry>
+			                          	<images>
+			                              		<image>
+			                                  		<name>onap/dmaap/kafka111</name>
+			                                  		<build>
+			                                      			<cleanup>try</cleanup>
+			                                     			<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+			                                     			<dockerFile>Dockerfile</dockerFile>
+			                                      			<tags>
+			                                          			<tag>${dockertag1}</tag>
+			                                          			<tag>${dockertag2}</tag>
+			                                      			</tags>
+			                                  		</build>
+			                              		</image>
+			                          	</images>
+			                      	</configuration>
+			                      	<executions>
+			                          	<execution>
+			                              		<id>generate-images</id>
+			                              		<phase>install</phase>
+			                              		<goals>
+			                                  		<goal>build</goal>
+			                              		</goals>
+			                          	</execution>
+			                          	<execution>
+			                              		<id>push-images</id>
+			                             	 	<phase>deploy</phase>
+			                              		<goals>
+			                                  		<goal>push</goal>
+			                              		</goals>
+			                          	</execution>
+			                      </executions>
+			        	</plugin>
 				</plugins>
 			</build>
 		</profile>
 
 	</profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index c330691..ee39c76 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,24 +1,28 @@
-FROM anapsix/alpine-java
+FROM openjdk:8-jre-alpine3.9
 
 ARG kafka_version=1.1.1
 ARG scala_version=2.12
 
 
-RUN apk add --update unzip wget curl docker jq coreutils
+RUN apk add --update unzip wget curl jq coreutils bash
 
 ENV KAFKA_VERSION=$kafka_version SCALA_VERSION=$scala_version
-ADD download-kafka.sh /tmp/download-kafka.sh
-ADD kafka_server_jaas.conf /tmp/kafka_server_jaas.conf
-ADD org.onap.dmaap.mr.trust.jks /tmp/org.onap.dmaap.mr.trust.jks
-ADD org.onap.dmaap.mr.p12 /tmp/org.onap.dmaap.mr.p12
-ADD org.onap.dmaap.mr.keyfile /tmp/org.onap.dmaap.mr.keyfile
-ADD cadi.properties /tmp/cadi.properties
-ADD mmagent.config /opt/etc/mmagent.config
-ADD consumer.properties /opt/etc/consumer.properties
-ADD producer.properties /opt/etc/producer.properties
-ADD kafka11aaf-jar-with-dependencies.jar /tmp/kafka11aaf-jar-with-dependencies.jar
-ADD dmaapMMAgent.jar /tmp/dmaapMMAgent.jar
-ADD kafka-run-class.sh /tmp/kafka-run-class.sh
+
+COPY download-kafka.sh \
+     kafka_server_jaas.conf \
+     org.onap.dmaap.mr.trust.jks \
+     org.onap.dmaap.mr.p12 \
+     org.onap.dmaap.mr.keyfile \
+     cadi.properties \
+     kafka11aaf-jar-with-dependencies.jar \
+     dmaapMMAgent.jar \
+     kafka-run-class.sh \
+     /tmp/
+
+COPY mmagent.config \
+     consumer.properties \
+     producer.properties \
+     /opt/etc/
 
 RUN chmod a+x /tmp/download-kafka.sh && sync && /tmp/download-kafka.sh && tar xfz /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz -C /opt && rm /tmp/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz && ln -s /opt/kafka_${SCALA_VERSION}-${KAFKA_VERSION} /opt/kafka
 
@@ -26,13 +30,17 @@ VOLUME ["/kafka"]
 
 ENV KAFKA_HOME /opt/kafka
 ENV PATH ${PATH}:${KAFKA_HOME}/bin
-ADD start-kafka.sh /usr/bin/start-kafka.sh
-ADD broker-list.sh /usr/bin/broker-list.sh
-ADD create-topics.sh /usr/bin/create-topics.sh
-ADD start-kafkaOrMirrorMaker.sh /usr/bin/start-kafkaOrMirrorMaker.sh
-ADD start-mirrormaker.sh /usr/bin/start-mirrormaker.sh
-RUN mkdir /opt/logs
-RUN touch /opt/logs/mmagent.log
+
+COPY start-kafka.sh \
+     broker-list.sh \
+     create-topics.sh \
+     start-kafkaOrMirrorMaker.sh \
+     start-mirrormaker.sh \
+     /usr/bin/
+
+RUN mkdir /opt/logs && \
+    touch /opt/logs/mmagent.log
+
 # The scripts need to have executable permission
 RUN chmod a+x /usr/bin/start-kafka.sh && \
     chmod a+x /usr/bin/broker-list.sh && \
@@ -46,4 +54,4 @@ RUN addgroup -S -g 1000  mrkafka  \
     && adduser -S  -u 1000 mrkafka  mrkafka \
     && chown -R mrkafka:mrkafka  /opt/kafka/ /opt/logs/ /opt/etc/ /kafka/  /usr/bin/ /tmp/
 
-USER mrkafka
\ No newline at end of file
+USER mrkafka