[FAB-6763] Give protos own namespace

Change-Id: Id0d96d42a2fec24c97be5af79e3e83917a8a79c3
Signed-off-by: Divyank Katira <Divyank.Katira@securekey.com>

scripts/third_party_pins/fabric/apply_fabric_protos.sh

@@ -12,6 +12,7 @@
 IMPORT_SUBSTS=($IMPORT_SUBSTS)
 
 GOIMPORTS_CMD=goimports
+NAMESPACE_PREFIX="sdk."
 
 declare -a PKGS=(
     "protos/common"
@@ -69,6 +70,39 @@ WORKING_DIR=$TMP_PROJECT_PATH FILES="${FILES[@]}" IMPORT_SUBSTS="${IMPORT_SUBSTS
 echo "Inserting modification notice ..."
 WORKING_DIR=$TMP_PROJECT_PATH FILES="${FILES[@]}" ALLOW_NONE_LICENSE_ID="true" scripts/third_party_pins/common/apply_header_notice.sh
 
+echo "Changing proto registration paths to be unique"
+for i in "${FILES[@]}"
+do
+  if [[ ${i} == "protos/common"* ]]; then
+    sed -i'' -e "/proto.RegisterType/s/common/${NAMESPACE_PREFIX}common/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/common/${NAMESPACE_PREFIX}common/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/ledger/rwset/rwset.pb.go" ]]; then
+    sed -i'' -e "/proto.RegisterType/s/rwset/${NAMESPACE_PREFIX}rwset/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/rwset/${NAMESPACE_PREFIX}rwset/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/ledger/rwset/kvrwset/kv_rwset.pb.go" ]]; then
+    sed -i'' -e "/proto.RegisterType/s/kvrwset/${NAMESPACE_PREFIX}kvrwset/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/kvrwset/${NAMESPACE_PREFIX}kvrwset/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/msp"* ]]; then
+    sed -i'' -e "/proto.RegisterType/s/msp/${NAMESPACE_PREFIX}msp/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/msp/${NAMESPACE_PREFIX}msp/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/msp/msp_principal.pb.go" ]]; then
+    sed -i'' -e "/proto.RegisterType/s/common/${NAMESPACE_PREFIX}common/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/common/${NAMESPACE_PREFIX}common/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/orderer"* ]]; then
+    sed -i'' -e "/proto.RegisterType/s/orderer/${NAMESPACE_PREFIX}orderer/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/orderer/${NAMESPACE_PREFIX}orderer/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+  if [[ ${i} == "protos/peer"* ]]; then
+    sed -i'' -e "/proto.RegisterType/s/protos/${NAMESPACE_PREFIX}protos/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/protos/${NAMESPACE_PREFIX}protos/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+done
+
 # Copy patched project into internal paths
 echo "Copying patched upstream project into working directory ..."
 for i in "${FILES[@]}"

scripts/third_party_pins/fabric/apply_fabric_protos_internal.sh

@@ -13,6 +13,7 @@ IMPORT_SUBSTS=($IMPORT_SUBSTS)
 
 GOIMPORTS_CMD=goimports
 GOFILTER_CMD="go run scripts/_go/cmd/gofilter/gofilter.go"
+NAMESPACE_PREFIX="sdk."
 
 declare -a PKGS=(
     "protos/utils"
@@ -53,7 +54,7 @@ gofilter() {
     $GOFILTER_CMD -filename "${TMP_PROJECT_PATH}/${FILTER_FILENAME}.bak" \
         -filters fn -fn "$FILTER_FN" \
         > "${TMP_PROJECT_PATH}/${FILTER_FILENAME}"
-} 
+}
 
 echo "Filtering Go sources for allowed functions ..."
 FILTER_FILENAME="protos/utils/commonutils.go"
@@ -82,6 +83,15 @@ echo "Inserting modification notice ..."
 WORKING_DIR=$TMP_PROJECT_PATH FILES="${NPBFILES[@]}" scripts/third_party_pins/common/apply_header_notice.sh
 WORKING_DIR=$TMP_PROJECT_PATH FILES="${PBFILES[@]}" ALLOW_NONE_LICENSE_ID="true" scripts/third_party_pins/common/apply_header_notice.sh
 
+echo "Changing proto registration paths to be unique"
+for i in "${FILES[@]}"
+do
+  if [[ ${i} == "protos/orderer"* ]]; then
+    sed -i'' -e "/proto.RegisterType/s/orderer/${NAMESPACE_PREFIX}orderer/g" "${TMP_PROJECT_PATH}/${i}"
+    sed -i'' -e "/proto.RegisterEnum/s/orderer/${NAMESPACE_PREFIX}orderer/g" "${TMP_PROJECT_PATH}/${i}"
+  fi
+done
+
 # Copy patched project into internal paths
 echo "Copying patched upstream project into working directory ..."
 for i in "${FILES[@]}"