From 11a94fe2e813e6028c3b34bdff7eb9823d446e8c Mon Sep 17 00:00:00 2001
From: Isaac Calligeros <101079287+IsaacCalligeros95@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:34:52 +1030
Subject: [PATCH] Minor typo fix and cleanup (#2158)
---
.../artifactory-generic-feeds.md | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/pages/docs/packaging-applications/package-repositories/artifactory-generic-feeds.md b/src/pages/docs/packaging-applications/package-repositories/artifactory-generic-feeds.md
index 08f3dfc8b0..1e44ebb502 100644
--- a/src/pages/docs/packaging-applications/package-repositories/artifactory-generic-feeds.md
+++ b/src/pages/docs/packaging-applications/package-repositories/artifactory-generic-feeds.md
@@ -8,7 +8,7 @@ navOrder: 60
---
:::div{.warning}
-From version **Octopus 2024.1.4058** we support Artifactory Generic Repositories. This functionality is behind the `ArtifactoryGenericFeedFeatureToggle` feature toggle, to request this functionality early, please context [support](https://octopus.com/support).
+From version **Octopus 2024.1.4058** we support Artifactory Generic Repositories. This functionality is behind the `ArtifactoryGenericFeedFeatureToggle` feature toggle, to request this functionality early, please contact [support](https://octopus.com/support).
:::
:::div{.warning}
@@ -23,21 +23,29 @@ You will then need to provide a feed name, the Artifactory repository name, an [
:::
-Artifactory generic feeds accommodate files of any type without requiring a specific file name structure. To handle this Artifactory supports [custom layouts](https://oc.to/ArtifactoryGenericLayouts). Custom layouts produce a regex expression that the file path and name must match, enabling Artifactory to extract the file type, version and module. This customizable package structure does not match Octopus's own expected [package versioning conventions](/docs/packaging-applications/create-packages/versioning) used in other feeds. To handle this we depend on the Artifact Path Pattern regex expression available from Artifactory to be set on the feed in Octopus. To find the _Artifact Path Pattern_ go to **Administration ➜ Layouts ➜ Regular Expression View ➜ Resolve** and copy the Artifact Path Regex expression. A new repository will use the default `simple-layout` generated by Artifactory, the regex for this layout is (?.+?)/(?[^/]+)/(?\2)-(?[^/]+?)\.(?(?:(?!\d))[^\-/]+|7z).
+Artifactory generic feeds accommodate files of any type without requiring a specific file name structure. To handle this Artifactory supports [custom layouts](https://oc.to/ArtifactoryGenericLayouts). Custom layouts produce a regex expression that the file path and name must match, enabling Artifactory to extract the file type, version and module. This customizable package structure does not match Octopus's expected [package versioning conventions](/docs/packaging-applications/create-packages/versioning) used in other feeds.
+To handle this we depend on the Artifact Path Pattern regex expression available from Artifactory to be set on the feed in Octopus.
+To find the _Artifact Path Pattern_ go to **Administration ➜ Layouts ➜ Regular Expression View ➜ Resolve** and copy the Artifact Path Regex expression. A new repository will use the default `simple-layout` generated by Artifactory, the regex for this layout is (?.+?)/(?[^/]+)/(?\2)-(?[^/]+?)\.(?(?:(?!\d))[^\-/]+|7z).
:::figure
:::
-The Octopus integration with Artifactory Generic Repositories depends on the artifacts matching the repository layout, specifically on the _module_ and _baseRev_ properties. An artifact can be tested whether it matches the layout regex using the _Test Artifact Path Resolution_ in Artifactory. When artifacts match the layout pattern the [listing versions for a specific package](https://oc.to/ArtifactVersionSearch) endpoint will return a list of all available versions. This also provides the package information when viewing an artifacts details in the Artifactory UI. If the package information properties are not visible in the Artifactory UI Octopus will not be able to list versions, or download these artifacts.
+The Octopus integration with Artifactory Generic Repositories depends on the artifacts matching the repository layout, specifically on the _module_ and _baseRev_ properties. An artifact can be tested whether it matches the layout regex by using the _Test Artifact Path Resolution_ in Artifactory. When artifacts match the layout pattern the [listing versions for a specific package](https://oc.to/ArtifactVersionSearch) endpoint will return a list of all available versions.
+
+This also provides the package information when viewing an artifacts details in the Artifactory UI. If the package information properties are not visible in the Artifactory UI Octopus will not be able to list versions, or download these artifacts.
:::figure
:::
-The regex layout in Artifactory is used to [list the versions of an artifact](https://oc.to/ArtifactVersionSearch). Searching and selecting a package uses the Artifactory Query Language to search within the repository, this does not depend on the layout. If a package has been found and selected but fetching versions fails when creating deployments this is likely due to the layout not matching the artifact within Artifactory.
+The regex layout in Artifactory is used to [list the versions of an artifact](https://oc.to/ArtifactVersionSearch). Searching and selecting a package uses the Artifactory Query Language to search within the repository, this does not depend on the layout.
+
+:::div{.warning}
+If a package has been found and selected but fetching versions fails when creating deployments this is likely due to the layout not matching the artifact within Artifactory.
+:::
-On the test page, you can search for packages, this will return the packageId expected by Octopus along with the artifact details. The expected packageId is `path/module` where the path is the folder structure to the artifact returned from the AQL query items.find(...) and the module is determined by parsing the regex expression set on the feed within Octopus.
+On the test page, you can search for packages, this will return the packageId expected by Octopus along with the artifact details. The expected packageId is `path/module` where the path is the folder structure to the artifact returned from the AQL query items.find(...) and the module is determined by the regex expression set on the feed within Octopus.
:::figure
