Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(datasource/galaxy-collection): migrate from v2 to v3 #25239

Merged
merged 10 commits into from
Nov 10, 2023
Merged

feat(datasource/galaxy-collection): migrate from v2 to v3 #25239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d3f1d4b
feat(datasource/galaxy-collection): migrate from v2 to v3
secustor Oct 16, 2023
e8ca36a
fix coverage & implement suggestion
secustor Oct 16, 2023
784f23f
enable custom registry support
secustor Oct 18, 2023
a5e734a
Merge branch 'main' into feat/move-galaxy-to-v3
secustor Nov 9, 2023
287677c
remove custom support
secustor Nov 10, 2023
0a3a092
simplify
secustor Nov 10, 2023
61b3a6c
fix schema and cache key
secustor Nov 10, 2023
c5839ec
add concurrency to correct mapping
secustor Nov 10, 2023
7edbb9b
use transform schema functionality for DetailedVersion
secustor Nov 10, 2023
cc75fd1
fix coverage
secustor Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions lib/modules/datasource/galaxy-collection/__fixtures__/community_kubernetes_base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
{
"id": 201,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/",
"namespace": "community",
"name": "kubernetes",
"namespace": {
"id": 17693,
"href": "https://galaxy.ansible.com/api/v1/namespaces/17693/",
"name": "community"
},
"versions_url": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/versions/",
"latest_version": {
"version": "1.2.1",
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/versions/1.2.1/"
},
"deprecated": false,
"created": "2020-02-05T10:08:00.780436-05:00",
"modified": "2021-04-01T09:06:02.676421-04:00"
"versions_url": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/versions/",
"highest_version": {
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/versions/2.0.1/",
"version": "2.0.1"
},
"created_at": "2023-05-08T20:27:28.514620Z",
"updated_at": "2023-10-15T22:54:12.688681Z",
"download_count": 15712290
}
104 changes: 69 additions & 35 deletions ...atasource/galaxy-collection/__fixtures__/community_kubernetes_version_details_0.11.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,28 @@
{
"id": 2800,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/versions/0.11.1/",
"download_url": "https://galaxy.ansible.com/download/community-kubernetes-0.11.1.tar.gz",
"version": "0.11.1",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/versions/0.11.1/",
"created_at": "2023-05-08T20:27:29.606154Z",
"updated_at": "2023-09-29T13:51:11.915940Z",
"requires_ansible": ">=2.9",
"marks": [],
"artifact": {
"filename": "community-kubernetes-0.11.1.tar.gz",
"size": 78870,
"sha256": "cd197084b32f8976394f269eb005bf475eff2122fddbb48380c76154ab4d4530"
},
"namespace": {
"id": 17693,
"href": "https://galaxy.ansible.com/api/v1/namespaces/17693/",
"name": "community"
"sha256": "cd197084b32f8976394f269eb005bf475eff2122fddbb48380c76154ab4d4530",
"size": 78870
},
"collection": {
"id": 201,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/",
"name": "kubernetes"
"id": "ec17eff8-7c2b-4687-aa14-ee5edab9bd62",
"name": "kubernetes",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/"
},
"version": "0.11.1",
"hidden": false,
"download_url": "https://galaxy.ansible.com/api/v3/plugin/ansible/content/published/collections/artifacts/community-kubernetes-0.11.1.tar.gz",
"name": "kubernetes",
"namespace": {
"name": "community",
"metadata_sha256": null
},
"signatures": [],
"metadata": {
"name": "kubernetes",
"tags": [
"kubernetes",
"k8s",
"cloud",
"infrastructure",
"openshift",
"okd",
"cluster"
],
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"readme": "README.md",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
Expand All @@ -42,14 +33,57 @@
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "0.11.1",
"contents": [],
"dependencies": {},
"description": "Kubernetes Collection for Ansible.",
"documentation": "",
"homepage": "",
"namespace": "community",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"license": [],
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"license_file": "LICENSE",
"documentation": ""
}
"tags": [
"cluster",
"okd",
"k8s",
"cloud",
"kubernetes",
"openshift",
"infrastructure"
]
},
"git_url": null,
"git_commit_sha": null,
"manifest": {
"format": 1,
"collection_info": {
"name": "kubernetes",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
"maxamillion (https://github.com/maxamillion)",
"jmontleon (https://github.com/jmontleon)",
"fabianvf (https://github.com/fabianvf)",
"willthames (https://github.com/willthames)",
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "0.11.1",
"homepage": "",
"namespace": "community",
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"documentation": ""
},
"file_manifest_file": {
"name": "FILES.json",
"ftype": "file",
"format": 1,
"chksum_type": "sha256",
"chksum_sha256": "d8b804d0cabd4891e1288f37378cbcdd321f1786fdcc8e86ee9c4dc97f20c9cc"
}
},
"files": {}
}
105 changes: 69 additions & 36 deletions ...datasource/galaxy-collection/__fixtures__/community_kubernetes_version_details_1.2.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@

{
"id": 6810,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/versions/1.2.0/",
"download_url": "https://galaxy.ansible.com/download/community-kubernetes-1.2.0.tar.gz",
"version": "1.2.0",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/versions/1.2.0/",
"created_at": "2023-05-08T20:27:29.625001Z",
"updated_at": "2023-09-29T13:51:22.996480Z",
"requires_ansible": ">=2.9.17",
"marks": [],
"artifact": {
"filename": "community-kubernetes-1.2.0.tar.gz",
"size": 119746,
"sha256": "a53eaf6a51987d30cc48ebcd20f0102dae0f17a7a02071928381e5a62951a0ed"
},
"namespace": {
"id": 17693,
"href": "https://galaxy.ansible.com/api/v1/namespaces/17693/",
"name": "community"
"sha256": "a53eaf6a51987d30cc48ebcd20f0102dae0f17a7a02071928381e5a62951a0ed",
"size": 119746
},
"collection": {
"id": 201,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/",
"name": "kubernetes"
"id": "ec17eff8-7c2b-4687-aa14-ee5edab9bd62",
"name": "kubernetes",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/"
},
"version": "1.2.0",
"hidden": false,
"download_url": "https://galaxy.ansible.com/api/v3/plugin/ansible/content/published/collections/artifacts/community-kubernetes-1.2.0.tar.gz",
"name": "kubernetes",
"namespace": {
"name": "community",
"metadata_sha256": null
},
"signatures": [],
"metadata": {
"name": "kubernetes",
"tags": [
"kubernetes",
"k8s",
"cloud",
"infrastructure",
"openshift",
"okd",
"cluster"
],
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"readme": "README.md",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
Expand All @@ -43,14 +33,57 @@
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "1.2.0",
"contents": [],
"dependencies": {},
"description": "Kubernetes Collection for Ansible.",
"documentation": "",
"homepage": "",
"namespace": "community",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"license": [],
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"license_file": "LICENSE",
"documentation": ""
}
"tags": [
"cluster",
"okd",
"k8s",
"cloud",
"kubernetes",
"openshift",
"infrastructure"
]
},
"git_url": null,
"git_commit_sha": null,
"manifest": {
"format": 1,
"collection_info": {
"name": "kubernetes",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
"maxamillion (https://github.com/maxamillion)",
"jmontleon (https://github.com/jmontleon)",
"fabianvf (https://github.com/fabianvf)",
"willthames (https://github.com/willthames)",
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "1.2.0",
"homepage": "",
"namespace": "community",
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"documentation": ""
},
"file_manifest_file": {
"name": "FILES.json",
"ftype": "file",
"format": 1,
"chksum_type": "sha256",
"chksum_sha256": "f01d32a9d742c93b2fa52bee42e9af0a6275180d36efa607cbe84e4ca33236a6"
}
},
"files": {}
}
105 changes: 69 additions & 36 deletions ...datasource/galaxy-collection/__fixtures__/community_kubernetes_version_details_1.2.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,28 @@

{
"id": 8039,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/versions/1.2.1/",
"download_url": "https://galaxy.ansible.com/download/community-kubernetes-1.2.1.tar.gz",
"version": "1.2.1",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/versions/1.2.1/",
"created_at": "2023-05-08T20:27:29.629269Z",
"updated_at": "2023-09-29T13:51:24.730687Z",
"requires_ansible": ">=2.9.17",
"marks": [],
"artifact": {
"filename": "community-kubernetes-1.2.1.tar.gz",
"size": 119908,
"sha256": "38e064bb32ee86781f0c6e56bd29fcfbaf48180f993e129185eb8420caabf223"
},
"namespace": {
"id": 17693,
"href": "https://galaxy.ansible.com/api/v1/namespaces/17693/",
"name": "community"
"sha256": "38e064bb32ee86781f0c6e56bd29fcfbaf48180f993e129185eb8420caabf223",
"size": 119908
},
"collection": {
"id": 201,
"href": "https://galaxy.ansible.com/api/v2/collections/community/kubernetes/",
"name": "kubernetes"
"id": "ec17eff8-7c2b-4687-aa14-ee5edab9bd62",
"name": "kubernetes",
"href": "/api/v3/plugin/ansible/content/published/collections/index/community/kubernetes/"
},
"version": "1.2.1",
"hidden": false,
"download_url": "https://galaxy.ansible.com/api/v3/plugin/ansible/content/published/collections/artifacts/community-kubernetes-1.2.1.tar.gz",
"name": "kubernetes",
"namespace": {
"name": "community",
"metadata_sha256": null
},
"signatures": [],
"metadata": {
"name": "kubernetes",
"tags": [
"kubernetes",
"k8s",
"cloud",
"infrastructure",
"openshift",
"okd",
"cluster"
],
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"readme": "README.md",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
Expand All @@ -43,14 +33,57 @@
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "1.2.1",
"contents": [],
"dependencies": {},
"description": "Kubernetes Collection for Ansible.",
"documentation": "",
"homepage": "",
"namespace": "community",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"license": [],
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"license_file": "LICENSE",
"documentation": ""
}
"tags": [
"cluster",
"okd",
"k8s",
"cloud",
"kubernetes",
"openshift",
"infrastructure"
]
},
"git_url": null,
"git_commit_sha": null,
"manifest": {
"format": 1,
"collection_info": {
"name": "kubernetes",
"issues": "https://github.com/ansible-collections/community.kubernetes/issues",
"authors": [
"chouseknecht (https://github.com/chouseknecht)",
"geerlingguy (https://www.jeffgeerling.com/)",
"maxamillion (https://github.com/maxamillion)",
"jmontleon (https://github.com/jmontleon)",
"fabianvf (https://github.com/fabianvf)",
"willthames (https://github.com/willthames)",
"mmazur (https://github.com/mmazur)",
"jamescassell (https://github.com/jamescassell)"
],
"license": [],
"version": "1.2.1",
"homepage": "",
"namespace": "community",
"repository": "https://github.com/ansible-collections/community.kubernetes",
"description": "Kubernetes Collection for Ansible.",
"dependencies": {},
"documentation": ""
},
"file_manifest_file": {
"name": "FILES.json",
"ftype": "file",
"format": 1,
"chksum_type": "sha256",
"chksum_sha256": "3cac847544852a208167b48ee6fc56bcd62e44d871e13c11d46c466aff3cdbcc"
}
},
"files": {}
}
Loading