Merge pull request #163 from eschizoid/bugfix/initiate-hook-valitdation

Fixed url hook validation
eschizoid · Jan 19, 2019 · b4c0021 · b4c0021
2 parents 9a6c69a + 6c90fb2
commit b4c0021
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/README.adoc b/README.adoc
@@ -255,7 +255,6 @@ $ flixctl library initiate
 
 $ flixctl library initiate \
     --archive-id U1IDD8GVNYGhtnbtjfr7_oV-h9hNqcjAkR1RfCdBrL8uoQdlViB0TtGUvnWrKkLM8nlf7LEZTV_X8CuXVoMKtnEBOBELgmmuQDIZkSA9xU-mlWJMSxf_132VcP4RTXNxZ7MdmTdNGA \
-    --job-id RP5RUuUyX0PxGlbipyeUr-pjPB74lYqOqXT6mA6sjrDU3y2Y7-ggAgQepNKeuULMpw8RIhNo6U60bTIONhxVI9dg61az \
     --slack-notification "true" \
     --slack-notification-channel "monitoring"
 

diff --git a/cmd/library/inventory.go b/cmd/library/inventory.go
@@ -26,19 +26,23 @@ var InventoryLibraryCmd = &cobra.Command{
 			SharedConfigState: sess.SharedConfigEnable,
 		}))
 		if sync, _ := strconv.ParseBool(enableLibrarySync); sync {
-			err := libraryService.DeleteteGlacierInventoryArchives()
-			ShowError(err)
-			svc := glacier.New(awsSession)
-			jobOutputOutput := glacierService.GetJobOutput(svc, jobID)
-			defer jobOutputOutput.Body.Close()
-			response, err := ioutil.ReadAll(jobOutputOutput.Body)
-			ShowError(err)
-			var inventoryRetrieve = new(InventoryRetrieve)
-			err = json.Unmarshal(response, &inventoryRetrieve)
-			ShowError(err)
-			for _, archive := range inventoryRetrieve.ArchiveList {
-				err = libraryService.SaveGlacierInventoryArchive(archive)
+			if jobID != "" {
+				err := libraryService.DeleteteGlacierInventoryArchives()
 				ShowError(err)
+				svc := glacier.New(awsSession)
+				jobOutputOutput := glacierService.GetJobOutput(svc, jobID)
+				defer jobOutputOutput.Body.Close()
+				response, err := ioutil.ReadAll(jobOutputOutput.Body)
+				ShowError(err)
+				var inventoryRetrieve = new(InventoryRetrieve)
+				err = json.Unmarshal(response, &inventoryRetrieve)
+				ShowError(err)
+				for _, archive := range inventoryRetrieve.ArchiveList {
+					err = libraryService.SaveGlacierInventoryArchive(archive)
+					ShowError(err)
+				}
+			} else {
+				panic("job-id parameter should be provided")
 			}
 		}
 		glacierArchives, err := libraryService.GetGlacierInventoryArchives()

diff --git a/infrastructure/database/storm/library.db b/infrastructure/database/storm/library.db
diff --git a/infrastructure/hooks/hooks.json b/infrastructure/hooks/hooks.json
@@ -287,7 +287,7 @@
         "value": "{{getenv "SLACK_STATUS_TOKEN"}}",
         "parameter": {
           "source": "payload",
-          "name": "token"
+          "name": "url"
         }
       }
     }