You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by "TSultanov (via GitHub)" <gi...@apache.org> on 2023/02/16 13:23:23 UTC
[GitHub] [beam] TSultanov commented on a diff in pull request #25508: [Playground] Playground network policy+MiTM proxy
TSultanov commented on code in PR #25508:
URL: https://github.com/apache/beam/pull/25508#discussion_r1108461210
##########
playground/backend/containers/go/entrypoint.sh:
##########
@@ -14,13 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-nohup /opt/mitmproxy/mitmdump -s /opt/mitmproxy/allow_list_proxy.py -p 8081 &
-while [ ! -f /home/appuser/.mitmproxy/mitmproxy-ca.pem ] ;
-do
- sleep 2
-done
-openssl x509 -in /home/appuser/.mitmproxy/mitmproxy-ca.pem -inform PEM -out /home/appuser/.mitmproxy/mitmproxy-ca.crt
-cp /home/appuser/.mitmproxy/mitmproxy-ca.crt /usr/local/share/ca-certificates/extra/
-update-ca-certificates
-
-/opt/playground/backend/server_go_backend
+export http_proxy=http://$PLAYGROUND_MITM_SERVICE_HOST:$PLAYGROUND_MITM_SERVICE_PORT
+export https_proxy=http://$PLAYGROUND_MITM_SERVICE_HOST:$PLAYGROUND_MITM_SERVICE_PORT
+/opt/playground/backend/server_go_backend
Review Comment:
Please add empty line to the end of the file
##########
playground/backend/containers/scio/Dockerfile:
##########
@@ -55,17 +56,7 @@ echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.l
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add
RUN apt-get update && apt-get install -y sbt
-
-## Install mitmpoxy
-RUN mkdir /opt/mitmproxy &&\
- cd /opt/mitmproxy &&\
- wget https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-linux.tar.gz &&\
- tar -zxvf mitmproxy-7.0.4-linux.tar.gz &&\
- mkdir /usr/local/share/ca-certificates/extra
-COPY allow_list_proxy.py /opt/mitmproxy/
-COPY allow_list.py /opt/mitmproxy/
-ENV HTTP_PROXY="http://127.0.0.1:8081"
-ENV HTTPS_PROXY="http://127.0.0.1:8081"
+RUN mkdir /usr/local/share/ca-certificates/extra
Review Comment:
Please remove
##########
playground/backend/containers/go/Dockerfile:
##########
@@ -58,16 +58,7 @@ ENV PROPERTY_PATH=/opt/playground/backend/properties.yaml
## Copy build result
COPY src/configs /opt/playground/backend/configs/
-# Install mitmpoxy
-RUN mkdir /opt/mitmproxy &&\
- cd /opt/mitmproxy &&\
- wget -q https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-linux.tar.gz &&\
- tar -zxvf mitmproxy-7.0.4-linux.tar.gz &&\
- mkdir /usr/local/share/ca-certificates/extra
-COPY allow_list_proxy.py /opt/mitmproxy/
-COPY allow_list.py /opt/mitmproxy/
-ENV HTTP_PROXY="http://127.0.0.1:8081"
-ENV HTTPS_PROXY="http://127.0.0.1:8081"
+RUN mkdir /usr/local/share/ca-certificates/extra
Review Comment:
Please remove
##########
playground/backend/containers/java/Dockerfile:
##########
@@ -94,16 +94,7 @@ RUN cd /go/src/katas &&\
./gradlew jar &&\
mv util/build/libs/util.jar /opt/apache/beam/jars/util.jar
-# Install mitmpoxy
-RUN mkdir /opt/mitmproxy &&\
- cd /opt/mitmproxy &&\
- wget https://snapshots.mitmproxy.org/7.0.4/mitmproxy-7.0.4-linux.tar.gz &&\
- tar -zxvf mitmproxy-7.0.4-linux.tar.gz &&\
- mkdir /usr/local/share/ca-certificates/extra
-COPY allow_list_proxy.py /opt/mitmproxy/
-COPY allow_list.py /opt/mitmproxy/
-ENV HTTP_PROXY="http://127.0.0.1:8081"
-ENV HTTPS_PROXY="http://127.0.0.1:8081"
+RUN mkdir /usr/local/share/ca-certificates/extra
Review Comment:
Please remove
##########
playground/backend/new_scio_project.sh:
##########
@@ -16,3 +16,6 @@
# limitations under the License.
yes | sbt new spotify/scio-template.g8
+
+mkdir y/lib
Review Comment:
Remove
##########
playground/infrastructure/helm-playground/templates/service-mitm.yaml:
##########
@@ -0,0 +1,35 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: backend-mitm
+ type: backend
+ name: playground-mitm
+ annotations:
+ cloud.google.com/backend-config: '{"default": "bkend-health"}'
+ cloud.google.com/neg: '{"ingress": true}'
+spec:
+ ports:
+ - name: tcp
+ port: 8080
+ protocol: TCP
+ targetPort: {{ .Values.service.targetPort }}
+ selector:
+ app: backend-mitm
+ type: {{ .Values.service.type }}
Review Comment:
Add empty line to the end of the file
##########
playground/backend/containers/scio/entrypoint.sh:
##########
@@ -14,13 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-nohup /opt/mitmproxy/mitmdump -s /opt/mitmproxy/allow_list_proxy.py -p 8081 &
-while [ ! -f /home/appuser/.mitmproxy/mitmproxy-ca.pem ] ;
-do
- sleep 2
-done
-openssl x509 -in /home/appuser/.mitmproxy/mitmproxy-ca.pem -inform PEM -out /home/appuser/.mitmproxy/mitmproxy-ca.crt
-cp /home/appuser/.mitmproxy/mitmproxy-ca.crt /usr/local/share/ca-certificates/extra/
-update-ca-certificates
+export http_proxy=http://$PLAYGROUND_MITM_SERVICE_HOST:$PLAYGROUND_MITM_SERVICE_PORT
+export https_proxy=http://$PLAYGROUND_MITM_SERVICE_HOST:$PLAYGROUND_MITM_SERVICE_PORT
+export JAVA_TOOL_OPTIONS="-Dhttp.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttp.proxyPort:$PLAYGROUND_MITM_SERVICE_PORT -Dhttps.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttps.proxyPort=$PLAYGROUND_MITM_SERVICE_PORT"
+export SBT_OPTS="-Dhttp.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttp.proxyPort:$PLAYGROUND_MITM_SERVICE_PORT -Dhttps.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttps.proxyPort=$PLAYGROUND_MITM_SERVICE_PORT"
Review Comment:
Replace with
```shell
export SBT_OPTS="$SBT_OPTS -Dhttp.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttp.proxyPort:$PLAYGROUND_MITM_SERVICE_PORT -Dhttps.proxyHost=$PLAYGROUND_MITM_SERVICE_HOST -Dhttps.proxyPort=$PLAYGROUND_MITM_SERVICE_PORT"
```
##########
playground/infrastructure/helm-playground/templates/deployment-mitmproxy.yaml:
##########
@@ -0,0 +1,39 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: playground-mitm
+ labels:
+ app: backend-mitm
+ type: backend
+spec:
+ template:
+ metadata:
+ name: playground
+ labels:
+ app: backend-mitm
+ type: backend
+ spec:
+ containers:
+ - name: playground-backend-mitm
+ image: "{{ .Values.registry}}/{{ .Values.image.mitm_image }}:{{ .Values.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: backend-mitm
Review Comment:
Add empty line to the end of the file
##########
playground/terraform/build.gradle.kts:
##########
@@ -498,5 +499,4 @@ tasks.register("gkebackend") {
pushFrontTask.mustRunAfter(pushBackTask)
indexcreateTask.mustRunAfter(pushFrontTask)
helmTask.mustRunAfter(indexcreateTask)
-}
-
+}
Review Comment:
add empty line to the end of the file
##########
playground/backend/containers/mitmproxy/settings.gradle:
##########
@@ -0,0 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+rootProject.name = 'apache-beam-playground-backend-mitmproxy'
Review Comment:
Please add empty line to the end of file
##########
playground/backend/new_scio_project.sh:
##########
@@ -16,3 +16,6 @@
# limitations under the License.
yes | sbt new spotify/scio-template.g8
+
+mkdir y/lib
+cp /opt/google-api-client.jar y/lib/
Review Comment:
Remove
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org