Generate correct PR name with params

circleci/docker.go

@@ -53,7 +53,7 @@ func findNewestDockerVersion(currentVersion string, parameters *map[string]strin
 	imageName := current[0]
 	imageTag := current[1]
 
-	if param := extractParameterName(currentVersion); len(param) > 0 {
+	if param := ExtractParameterName(currentVersion); len(param) > 0 {
 		paramDefault, found := (*parameters)[param]
 		if !found {
 			log.Debug().Msgf("Parameter %s not found in parameters", param)

circleci/update.go

@@ -156,10 +156,10 @@ func ReplaceVersion(orb *yaml.Node, oldVersion string, content string) string {
 	return output
 }
 
-func extractParameterName(param string) string {
+func ExtractParameterName(param string) string {
 	r := regexp.MustCompile(`<<\s*parameters\.(\w+)\s*>>`)
 	match := r.FindStringSubmatch(param)
-	if len(match) == 2 {
+	if len(match) > 1 {
 		return match[1]
 	}
 	return ""

dependabot/dependabot.go

@@ -281,8 +281,20 @@ func generatePRTitle(update circleci.Update, newName string) string {
 	}
 	oldVersion = strings.Split(update.CurrentName, separator)
 	newVersion = strings.Split(newName, separator)
-
-	return fmt.Sprintf("Bump @%s from %s to %s", oldVersion[0], oldVersion[1], newVersion[1])
+	param := circleci.ExtractParameterName(oldVersion[1])
+	oldVersionNumber := oldVersion[1]
+	if len(param) > 0 {
+		// Try getting version from first changed file
+		for _, v := range update.FileUpdates {
+			if oldParamValue, found := (*v.Parameters)[param]; found {
+				oldVersionNumber = oldParamValue
+			} else {
+				oldVersionNumber = param
+			}
+			break
+		}
+	}
+	return fmt.Sprintf("Bump @%s from %s to %s", oldVersion[0], oldVersionNumber, newVersion[1])
 }
 
 func isYaml(fileName string) bool {