Change WAR to JAR file upload (#14)

paion-data · Jul 11, 2024 · 2ece32b · 2ece32b
1 parent 0134688
commit 2ece32b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.web-docs/components/provisioner/webservice/README.md b/.web-docs/components/provisioner/webservice/README.md
@@ -3,14 +3,14 @@
   be helpful to a user. See https://www.packer.io/docs/provisioner/null
 -->
 
-The `webservice` provisioner is used to install Jersey-Jetty webservice WAR file in AWS AMI image
+The `webservice` provisioner is used to install Spring Boot webservice JAR file in AWS AMI image
 
 
 <!-- Provisioner Configuration Fields -->
 
 **Required**
 
-- `warSource` (string) - The path to a local WAR file to upload to the machine. The path can be absolute or relative. If
+- `jarSource` (string) - The path to a local JAR file to upload to the machine. The path can be absolute or relative. If
    it is relative, it is relative to the working directory when Packer is executed.
 
 
@@ -76,7 +76,7 @@ build {
 
   provisioner "paion-data-webservice-provisioner" {
     homeDir   = "/home/ubuntu"
-    warSource = "my-webservice.war"
+    jarSource = "my-webservice.jar"
   }
 }
 ```
diff --git a/docs/provisioners/webservice.mdx b/docs/provisioners/webservice.mdx
@@ -6,14 +6,14 @@ Type: `webservice`
   be helpful to a user. See https://www.packer.io/docs/provisioners/null
 -->
 
-The `webservice` provisioner is used to install Jersey-Jetty webservice WAR file in AWS AMI image
+The `webservice` provisioner is used to install Spring Boot webservice JAR file in AWS AMI image
 
 
 <!-- Provisioner Configuration Fields -->
 
 **Required**
 
-- `warSource` (string) - The path to a local WAR file to upload to the machine. The path can be absolute or relative. If
+- `jarSource` (string) - The path to a local JAR file to upload to the machine. The path can be absolute or relative. If
    it is relative, it is relative to the working directory when Packer is executed.
 
 
@@ -79,7 +79,7 @@ build {
 
   provisioner "paion-data-webservice-provisioner" {
     homeDir   = "/home/ubuntu"
-    warSource = "my-webservice.war"
+    jarSource = "my-webservice.jar"
   }
 }
 ```
diff --git a/provisioner/webservice/provisioner.go b/provisioner/webservice/provisioner.go
@@ -19,7 +19,7 @@ import (
 )
 
 type Config struct {
-	WarSource string `mapstructure:"warSource" required:"true"`
+	JarSource string `mapstructure:"jarSource" required:"true"`
 	HomeDir   string `mapstructure:"homeDir" required:"false"`
 
 	ctx interpolate.Context
@@ -45,9 +45,9 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 func (p *Provisioner) Provision(ctx context.Context, ui packersdk.Ui, communicator packersdk.Communicator, generatedData map[string]interface{}) error {
 	p.config.HomeDir = ssl.GetHomeDir(p.config.HomeDir)
 
-	warFileDst := fmt.Sprintf(filepath.Join(p.config.HomeDir, "ROOT.war"))
+	jarFileDst := fmt.Sprintf(filepath.Join(p.config.HomeDir, "webservice.jar"))
 
-	err := file.Provision(p.config.ctx, ui, communicator, p.config.WarSource, warFileDst)
+	err := file.Provision(p.config.ctx, ui, communicator, p.config.JarSource, jarFileDst)
 	if err != nil {
 		return err
 	}

diff --git a/provisioner/webservice/provisioner.hcl2spec.go b/provisioner/webservice/provisioner.hcl2spec.go
diff --git a/provisioner/webservice/provisioner_acc_test.go b/provisioner/webservice/provisioner_acc_test.go
@@ -20,7 +20,7 @@ import (
 var testProvisionerHCL2Docker string
 
 func TestAccWebserviceProvisioner(t *testing.T) {
-	tempFile, err := os.CreateTemp(t.TempDir(), "my-webservice.war")
+	tempFile, err := os.CreateTemp(t.TempDir(), "my-webservice.jar")
 	if err != nil {
 		return
 	}
@@ -33,7 +33,7 @@ func TestAccWebserviceProvisioner(t *testing.T) {
 		Teardown: func() error {
 			return nil
 		},
-		Template: strings.Replace(testProvisionerHCL2Docker, "my-webservice.war", tempFile.Name(), -1),
+		Template: strings.Replace(testProvisionerHCL2Docker, "my-webservice.jar", tempFile.Name(), -1),
 		Type:     "paion-data-webservice-provisioner",
 		Check: func(buildCommand *exec.Cmd, logfile string) error {
 			if buildCommand.ProcessState != nil {

diff --git a/provisioner/webservice/test-fixtures/template-docker.pkr.hcl b/provisioner/webservice/test-fixtures/template-docker.pkr.hcl
@@ -22,6 +22,6 @@ build {
 
   provisioner "paion-data-webservice-provisioner" {
     homeDir   = "/"
-    warSource = "my-webservice.war"
+    jarSource = "my-webservice.jar"
   }
 }