Merge pull request #22 from hazelcast-guides/cn-1202

[CN-1202] Add subdir in examples to avoid resource conflict
hazelcast-guides · May 15, 2024 · 251c3da · 251c3da
2 parents a190a47 + 3e22a7f
commit 251c3da
Show file tree

Hide file tree

Showing 28 changed files with 70 additions and 173 deletions.
diff --git a/.github/workflows/integrational-tests.yml b/.github/workflows/integrational-tests.yml
@@ -8,6 +8,7 @@ env:
   GCP_PROJECT_ID: ${{ secrets.GKE_PROJECT }}
   GKE_ZONE: europe-west1-b
   GCP_NETWORK: tutorial-test-network
+  EXAMPLES_DIR: docs/modules/ROOT/examples/operator-expose-externally
 
 jobs:
   create-gke-cluster:
@@ -79,10 +80,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK
         uses: actions/setup-java@v2
         with:
-          java-version: 8
+          java-version: 17
           distribution: "adopt"
           cache: "maven"
 
@@ -126,7 +127,7 @@ jobs:
 
       - name: Deploy Hazelcast cluster
         run: |-
-          kubectl apply -f hazelcast${{matrix.suffix}}.yaml
+          kubectl apply -f $EXAMPLES_DIR/hazelcast${{matrix.suffix}}.yaml
 
       - name: Waith for Hazelcast cluster to be ready
         run: |-
@@ -163,7 +164,7 @@ jobs:
       - name: Test Java Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd java${{matrix.suffix}}
+          cd $EXAMPLES_DIR/java${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" src/main/java/com/hazelcast/Main.java
           mvn package
           java -jar target/*jar-with-dependencies*.jar >> output-java.txt &
@@ -176,7 +177,7 @@ jobs:
       - name: Test Node.js Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd nodejs${{matrix.suffix}}
+          cd $EXAMPLES_DIR/nodejs${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" client.js
           npm install
           npm start >> output-nodejs.txt &
@@ -189,7 +190,7 @@ jobs:
       - name: Test Go Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd go${{matrix.suffix}}
+          cd $EXAMPLES_DIR/go${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" main.go
           go run main.go >> output-go.txt &
           PID=$!
@@ -201,7 +202,7 @@ jobs:
       - name: Test Python Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd python${{matrix.suffix}}
+          cd $EXAMPLES_DIR/python${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" main.py
           pip install -r requirements.txt
           python main.py >> output-python.txt &

diff --git a/dotnet-unisocket/csharp_example.cs → ...rnally/dotnet-unisocket/csharp_example.cs b/dotnet-unisocket/csharp_example.cs → ...rnally/dotnet-unisocket/csharp_example.cs
diff --git a/dotnet-unisocket/dotnet-unisocket.csproj → .../dotnet-unisocket/dotnet-unisocket.csproj b/dotnet-unisocket/dotnet-unisocket.csproj → .../dotnet-unisocket/dotnet-unisocket.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Hazelcast.Net" Version="5.3.0" />
+      <PackageReference Include="Hazelcast.Net" Version="5.3.1" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.6.23329.7" />
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>

diff --git a/dotnet/Program.cs → ...rator-expose-externally/dotnet/Program.cs b/dotnet/Program.cs → ...rator-expose-externally/dotnet/Program.cs
diff --git a/dotnet/dotnet.csproj → ...or-expose-externally/dotnet/dotnet.csproj b/dotnet/dotnet.csproj → ...or-expose-externally/dotnet/dotnet.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Hazelcast.Net" Version="5.3.0" />
+      <PackageReference Include="Hazelcast.Net" Version="5.3.1" />
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>
 

diff --git a/go-unisocket/go.mod → ...tor-expose-externally/go-unisocket/go.mod b/go-unisocket/go.mod → ...tor-expose-externally/go-unisocket/go.mod
@@ -3,6 +3,6 @@ module github.com/hazelcast-guides/kubernetes/go
 go 1.15
 
 require (
-	github.com/hazelcast/hazelcast-go-client v1.4.0
+	github.com/hazelcast/hazelcast-go-client v1.4.1
 	github.com/shirou/gopsutil/v3 v3.21.10 // indirect
 )
diff --git a/go-unisocket/go.sum → ...tor-expose-externally/go-unisocket/go.sum b/go-unisocket/go.sum → ...tor-expose-externally/go-unisocket/go.sum
@@ -11,8 +11,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hazelcast/hazelcast-go-client v1.4.0 h1:8+fvcG+Owf5mi3qezc8FN9CG6Vpb6x8tqKTb9nXrQWk=
-github.com/hazelcast/hazelcast-go-client v1.4.0/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
+github.com/hazelcast/hazelcast-go-client v1.4.1 h1:BSpJqqjbACI4MugfWXGxk+JdZR3JRELx0n769pa85kA=
+github.com/hazelcast/hazelcast-go-client v1.4.1/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

diff --git a/go-unisocket/main.go → ...or-expose-externally/go-unisocket/main.go b/go-unisocket/main.go → ...or-expose-externally/go-unisocket/main.go
diff --git a/go/go.mod → ...ples/operator-expose-externally/go/go.mod b/go/go.mod → ...ples/operator-expose-externally/go/go.mod
@@ -3,6 +3,6 @@ module github.com/hazelcast-guides/kubernetes/go
 go 1.15
 
 require (
-	github.com/hazelcast/hazelcast-go-client v1.4.0
+	github.com/hazelcast/hazelcast-go-client v1.4.1
 	github.com/shirou/gopsutil/v3 v3.21.10 // indirect
 )
diff --git a/go/go.sum → ...ples/operator-expose-externally/go/go.sum b/go/go.sum → ...ples/operator-expose-externally/go/go.sum
@@ -11,8 +11,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hazelcast/hazelcast-go-client v1.4.0 h1:8+fvcG+Owf5mi3qezc8FN9CG6Vpb6x8tqKTb9nXrQWk=
-github.com/hazelcast/hazelcast-go-client v1.4.0/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
+github.com/hazelcast/hazelcast-go-client v1.4.1 h1:BSpJqqjbACI4MugfWXGxk+JdZR3JRELx0n769pa85kA=
+github.com/hazelcast/hazelcast-go-client v1.4.1/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

diff --git a/go/main.go → ...les/operator-expose-externally/go/main.go b/go/main.go → ...les/operator-expose-externally/go/main.go
diff --git a/hazelcast-unisocket.yaml → ...xpose-externally/hazelcast-unisocket.yaml b/hazelcast-unisocket.yaml → ...xpose-externally/hazelcast-unisocket.yaml
diff --git a/hazelcast.yaml → ...operator-expose-externally/hazelcast.yaml b/hazelcast.yaml → ...operator-expose-externally/hazelcast.yaml
diff --git a/java-unisocket/pom.xml → ...-expose-externally/java-unisocket/pom.xml b/java-unisocket/pom.xml → ...-expose-externally/java-unisocket/pom.xml
@@ -9,15 +9,15 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>5.0</version>
+            <version>5.4.0</version>
         </dependency>
     </dependencies>
 

diff --git a/...ket/src/main/java/com/hazelcast/Main.java → ...ket/src/main/java/com/hazelcast/Main.java b/...ket/src/main/java/com/hazelcast/Main.java → ...ket/src/main/java/com/hazelcast/Main.java
diff --git a/java/pom.xml → ...s/operator-expose-externally/java/pom.xml b/java/pom.xml → ...s/operator-expose-externally/java/pom.xml
@@ -9,15 +9,15 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>5.0</version>
+            <version>5.4.0</version>
         </dependency>
     </dependencies>
 

diff --git a/java/src/main/java/com/hazelcast/Main.java → ...ava/src/main/java/com/hazelcast/Main.java b/java/src/main/java/com/hazelcast/Main.java → ...ava/src/main/java/com/hazelcast/Main.java
diff --git a/nodejs-unisocket/client.js → ...ose-externally/nodejs-unisocket/client.js b/nodejs-unisocket/client.js → ...ose-externally/nodejs-unisocket/client.js
diff --git a/nodejs-unisocket/package-lock.json → ...rnally/nodejs-unisocket/package-lock.json b/nodejs-unisocket/package-lock.json → ...rnally/nodejs-unisocket/package-lock.json
diff --git a/nodejs-unisocket/package.json → ...-externally/nodejs-unisocket/package.json b/nodejs-unisocket/package.json → ...-externally/nodejs-unisocket/package.json
diff --git a/nodejs/client.js → ...erator-expose-externally/nodejs/client.js b/nodejs/client.js → ...erator-expose-externally/nodejs/client.js
diff --git a/nodejs/package-lock.json → ...xpose-externally/nodejs/package-lock.json b/nodejs/package-lock.json → ...xpose-externally/nodejs/package-lock.json
diff --git a/nodejs/package.json → ...tor-expose-externally/nodejs/package.json b/nodejs/package.json → ...tor-expose-externally/nodejs/package.json
diff --git a/python-unisocket/main.py → ...xpose-externally/python-unisocket/main.py b/python-unisocket/main.py → ...xpose-externally/python-unisocket/main.py
diff --git a/python-unisocket/requirements.txt → ...ernally/python-unisocket/requirements.txt b/python-unisocket/requirements.txt → ...ernally/python-unisocket/requirements.txt
diff --git a/python/main.py → ...operator-expose-externally/python/main.py b/python/main.py → ...operator-expose-externally/python/main.py
diff --git a/python/requirements.txt → ...expose-externally/python/requirements.txt b/python/requirements.txt → ...expose-externally/python/requirements.txt