From c282d3673795db2771c8aeb60664907063eb6cf0 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:27:29 -0600 Subject: [PATCH 01/16] fix: update renovate --- renovate.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index a257b2c..706c76b 100644 --- a/renovate.json +++ b/renovate.json @@ -61,10 +61,15 @@ "updateTypes": ["patch"], "labels": ["renovate/helm-release", "dependency/patch"] }, - { + { "description": "Group Github Actions and vscode/settings.json updates.", "matchPaths": [".github/**", ".vscode/settings.json"], "groupName": "GHA-DEPS" + }, + { + "description": "Group updates in src/plugin/pom.xml file into keycloak-updates group.", + "matchPaths": ["src/plugin/pom.xml"], + "groupName": "keycloak-updates" } ], "regexManagers":[ @@ -75,6 +80,6 @@ ], "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" - } + } ] } From 066765f2d9537b24ca75478a4ae605bacc7b815b Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:32:30 -0600 Subject: [PATCH 02/16] fix: renovate config --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 706c76b..ae691b1 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcFMA/xDdHCJBTolARAAiYqwOfwkjFnb7ifSRLxTGwyh5K8sUv4LFnEt9+clanU0hAoab9qY+98XLG9F5q+JuNWW9XSRgEYvg21LPhpux+2n+sF/n5UHNEc0X2C9zPVKBzRBu4RoNlsWNdq+wQaznHuw/iKmcDKddB29GTcXAC27ON78ex4jW4GBBEIY75OYfWUVJl3VM8cbK3t5iPNeldmdtS/1rEe8U2tGRdYvkwbMjM1hscHfc5wK06zt8NKz874jpqDYs9jT3FVrJbG9FHoTsrLvC9cEknu1BR3+LrEEV2UTpN+xkLbkCiI9F3rHwwYrAKpm3VDxjieWP2PbAZcazPvqNrC12pR3QrdbIN+6w7Xc9lIOuCcR+nB1mCTaZv4wGYoHmXat/nW58wAHqGzEnkfgfW7/dXvvZPoV/54CW2B8/iEp3oCf/mHk6tM/nlaN0fOcyFuLthD2t3L8bZEU8v88Bpa9sZgQYTg8vO3zGZeXqTznmq8NfseCXezho0syBize/4c7NI67JoVGJGUtOSZ56cNJkmNEhzH3CCKoD+j6shrojQ1yPLFgfxMa1zkp0tcAJ2dMxBbdMiGRKJcnJLRUi3N0z5I+JdydSZlFFj6Y+w7jWs1cff3mTyFCyhK3USyz+pF/ctTwpWixWWR7Zu/I0lqOr90LMri0bjzOf3xWP0eV3Osbi40BmdjScgG2LbZNVbKesnxaKLqzeubgLz9aTVTjHfHWQ753t4Ge/NPq+618M8JXuujYRc/Hw4bm1G7NHTKxPhiHCmDu+wPsNvt+nUvyk9Wb72XHYNdA8bUjV1gHj/1oSc3yGjOyiyaxDUR+nkPB8B+tr1cMWcVczw", + "username": "wcBMA8xOaBJvzJNbAQf6AoEBTuAu4SU5SxMeqSKqoDsFRguDn6KTBNYVxuomwLz/Wa2hEVNhsUZzRO+Lgm9U9DeXEL/W+i2oJzPmESe/xpDagQNVdVAQvBkN9TiDp5Vm0SC66xfLiYZmvPA7KZEYyO+L23Ii0kf67VgdE8L8eCMkKFT6HybmfNFmzkOZUJs2geOrpCSxDrN0NvCwbeYgSbhsXYUWqr1eNYP9AqxeXNlhjQ2tS+26epmigOx/sbqO+c8DVqOA01S4NTdg9Nt7ElSFM4KoCcm25ttY65qHH615kZH9yUTWfH+ZbTM4tAzoP2Jj9PpRG3B/VFgnUvHBvP9i+GkaVokyAIVYinmoStJhAc89hvKDh0Hm60Xw8aroTpUsFecjOrDE5T7aiSagFbiP2/G24zywQ6K4dKupHu6K7gXgDnNv1MckzZCVpB+eM+MRU+QxQ7qVKefh2T8xdxR3Mu7LDmCfAspjsoe7tNWbzA", "password": "wcFMA/xDdHCJBTolAQ/9FqgG7wEhIpomA4DpTgDIQdShdkpUHxRCAaOXOaYamKxmyqQgX0N55hVvMt100/JK0AomtTehrWjsyYmvOA5bi2QqkJgEu7Vk/Nyg+CeJj27lZnbZ2wkWhIPUUZKbnGzNg8vmFqeSbI/nhcwwG+1Iiy06pBf/NB1V8KeezD3ICPJAe7HfW5FYDpuAnqo4ktagTEcmKp9bSztAEmNVgS325mE+SB5oGI7zZre4WLDmYCcawCJfwE2HqiWp9E42oiyEgsAa2RNmy/9RLMRq8QmAJY9UuAMDgyRUKh1bVEh2rhg3pV8N8ImqD8a7y/b5HOH5SE1b459K7rUACimJf8GtQtuUmU3bEhhYzafbN8sB6PByOgWEqPKvcCffLghCzsene4lOyie48rC0UZSTRrNiebcLLeJTnkQsUNm8x6GN34mZU4qkBam7Isvdyc7BcSo2rvMbsuMJEuns8Ua3TQlAab1PXofHjwf7aDPee4hLtJsR75IdeWA3mhPKo2hnZ08cBDwhsB7aXYxrH3rXAbPx7FvgcxGA73gCFwNXLf6S2xHb+D7C/ny4z9XhIQk4BrxKlmPFlfpELoijHQ34VBilM/XkeICbtBJghE31X3Ef/LZdLBsR9gvT4nK+zRRLVnEqndO4YkHFOjwKWQxyaGmN+ZE5gSbPx0R1EBo7vM48merSdgGRZxfF5OodxM/b3+xxBe6CXqi5yYVeNf/Op/lH/5baX6LUQCYHSNPXPHMstFYQm9QBwn6rA2aOYXojRehYwj8ymQo0wJ0TgVtGHDu+ODhTiPjZV1Mm7vVkucl63FLCDe7odIAgNVMBRInDbGYhKmA+I7To1gU" } } From 48a63bdb25865dc32ce7f52329bdeb4ac95521fd Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:35:43 -0600 Subject: [PATCH 03/16] test --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index ae691b1..b0c8a69 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQf6AoEBTuAu4SU5SxMeqSKqoDsFRguDn6KTBNYVxuomwLz/Wa2hEVNhsUZzRO+Lgm9U9DeXEL/W+i2oJzPmESe/xpDagQNVdVAQvBkN9TiDp5Vm0SC66xfLiYZmvPA7KZEYyO+L23Ii0kf67VgdE8L8eCMkKFT6HybmfNFmzkOZUJs2geOrpCSxDrN0NvCwbeYgSbhsXYUWqr1eNYP9AqxeXNlhjQ2tS+26epmigOx/sbqO+c8DVqOA01S4NTdg9Nt7ElSFM4KoCcm25ttY65qHH615kZH9yUTWfH+ZbTM4tAzoP2Jj9PpRG3B/VFgnUvHBvP9i+GkaVokyAIVYinmoStJhAc89hvKDh0Hm60Xw8aroTpUsFecjOrDE5T7aiSagFbiP2/G24zywQ6K4dKupHu6K7gXgDnNv1MckzZCVpB+eM+MRU+QxQ7qVKefh2T8xdxR3Mu7LDmCfAspjsoe7tNWbzA", + "username": "wcBMA8xOaBJvzJNbAQgAijJ3+H6KQ7iAiOMaew0PdarIld7qa+S058cIPzQi5yE+pHfULqJp5yaiuW4O2O2bkP5NLjZLeK+tQA69ev7evIak2/k6VxhdUuL60lRid4zSg9agtFFxNYbNR0LsYxH2d6kSMZB2+uwAud8xBY/VU3zMXOyiAXMFF1iMTlPC14ywME1cvbHzGD1QNv4iuozkp802dkdmUWE8McB4fdGFTd75aYVxTtcESQiMRFOM/enQe05c6AeZvWG5wGOqs3OMIS19YvRqTMB9pXqrflY8LJ1JjVohquTSbwSMiaFXSkf/zOdtNN+WB0Q8ryA12Bc5rOq4osKHHPHgBSzA5FbgWtJ0ASvqQitj6cam/suZzOW+WhN9PFREjSP2F0gXLGXmx2N8JI8ZzcEiGcIpfvUPxB+c3CAGUpNGzWIfgNYJ+zNtHH4GpUndvwwskISPIgvGO2jSxRecDjD8X5BXnV4UL0VhLbaATRURqalVf5eIyhy5D4Xrh+M", "password": "wcFMA/xDdHCJBTolAQ/9FqgG7wEhIpomA4DpTgDIQdShdkpUHxRCAaOXOaYamKxmyqQgX0N55hVvMt100/JK0AomtTehrWjsyYmvOA5bi2QqkJgEu7Vk/Nyg+CeJj27lZnbZ2wkWhIPUUZKbnGzNg8vmFqeSbI/nhcwwG+1Iiy06pBf/NB1V8KeezD3ICPJAe7HfW5FYDpuAnqo4ktagTEcmKp9bSztAEmNVgS325mE+SB5oGI7zZre4WLDmYCcawCJfwE2HqiWp9E42oiyEgsAa2RNmy/9RLMRq8QmAJY9UuAMDgyRUKh1bVEh2rhg3pV8N8ImqD8a7y/b5HOH5SE1b459K7rUACimJf8GtQtuUmU3bEhhYzafbN8sB6PByOgWEqPKvcCffLghCzsene4lOyie48rC0UZSTRrNiebcLLeJTnkQsUNm8x6GN34mZU4qkBam7Isvdyc7BcSo2rvMbsuMJEuns8Ua3TQlAab1PXofHjwf7aDPee4hLtJsR75IdeWA3mhPKo2hnZ08cBDwhsB7aXYxrH3rXAbPx7FvgcxGA73gCFwNXLf6S2xHb+D7C/ny4z9XhIQk4BrxKlmPFlfpELoijHQ34VBilM/XkeICbtBJghE31X3Ef/LZdLBsR9gvT4nK+zRRLVnEqndO4YkHFOjwKWQxyaGmN+ZE5gSbPx0R1EBo7vM48merSdgGRZxfF5OodxM/b3+xxBe6CXqi5yYVeNf/Op/lH/5baX6LUQCYHSNPXPHMstFYQm9QBwn6rA2aOYXojRehYwj8ymQo0wJ0TgVtGHDu+ODhTiPjZV1Mm7vVkucl63FLCDe7odIAgNVMBRInDbGYhKmA+I7To1gU" } } From 77ef54fa49e3c5117d79723f9903b1fe273056b2 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:37:35 -0600 Subject: [PATCH 04/16] test --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index b0c8a69..c014873 100644 --- a/renovate.json +++ b/renovate.json @@ -14,7 +14,7 @@ "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { "username": "wcBMA8xOaBJvzJNbAQgAijJ3+H6KQ7iAiOMaew0PdarIld7qa+S058cIPzQi5yE+pHfULqJp5yaiuW4O2O2bkP5NLjZLeK+tQA69ev7evIak2/k6VxhdUuL60lRid4zSg9agtFFxNYbNR0LsYxH2d6kSMZB2+uwAud8xBY/VU3zMXOyiAXMFF1iMTlPC14ywME1cvbHzGD1QNv4iuozkp802dkdmUWE8McB4fdGFTd75aYVxTtcESQiMRFOM/enQe05c6AeZvWG5wGOqs3OMIS19YvRqTMB9pXqrflY8LJ1JjVohquTSbwSMiaFXSkf/zOdtNN+WB0Q8ryA12Bc5rOq4osKHHPHgBSzA5FbgWtJ0ASvqQitj6cam/suZzOW+WhN9PFREjSP2F0gXLGXmx2N8JI8ZzcEiGcIpfvUPxB+c3CAGUpNGzWIfgNYJ+zNtHH4GpUndvwwskISPIgvGO2jSxRecDjD8X5BXnV4UL0VhLbaATRURqalVf5eIyhy5D4Xrh+M", - "password": "wcFMA/xDdHCJBTolAQ/9FqgG7wEhIpomA4DpTgDIQdShdkpUHxRCAaOXOaYamKxmyqQgX0N55hVvMt100/JK0AomtTehrWjsyYmvOA5bi2QqkJgEu7Vk/Nyg+CeJj27lZnbZ2wkWhIPUUZKbnGzNg8vmFqeSbI/nhcwwG+1Iiy06pBf/NB1V8KeezD3ICPJAe7HfW5FYDpuAnqo4ktagTEcmKp9bSztAEmNVgS325mE+SB5oGI7zZre4WLDmYCcawCJfwE2HqiWp9E42oiyEgsAa2RNmy/9RLMRq8QmAJY9UuAMDgyRUKh1bVEh2rhg3pV8N8ImqD8a7y/b5HOH5SE1b459K7rUACimJf8GtQtuUmU3bEhhYzafbN8sB6PByOgWEqPKvcCffLghCzsene4lOyie48rC0UZSTRrNiebcLLeJTnkQsUNm8x6GN34mZU4qkBam7Isvdyc7BcSo2rvMbsuMJEuns8Ua3TQlAab1PXofHjwf7aDPee4hLtJsR75IdeWA3mhPKo2hnZ08cBDwhsB7aXYxrH3rXAbPx7FvgcxGA73gCFwNXLf6S2xHb+D7C/ny4z9XhIQk4BrxKlmPFlfpELoijHQ34VBilM/XkeICbtBJghE31X3Ef/LZdLBsR9gvT4nK+zRRLVnEqndO4YkHFOjwKWQxyaGmN+ZE5gSbPx0R1EBo7vM48merSdgGRZxfF5OodxM/b3+xxBe6CXqi5yYVeNf/Op/lH/5baX6LUQCYHSNPXPHMstFYQm9QBwn6rA2aOYXojRehYwj8ymQo0wJ0TgVtGHDu+ODhTiPjZV1Mm7vVkucl63FLCDe7odIAgNVMBRInDbGYhKmA+I7To1gU" + "password": "wcBMA8xOaBJvzJNbAQf+N3ITTcvPINSMdcp81nBWPA0XhMuuBCqKdB6LjUqPH1j+ElHSeNFB1s34y7cbZ8Z74B5SAEU7UMoq7KMtRd7ROyQ3qJcpJEx43qlrW2bEiArWvYlU7n6NSUXmwIoEmVeJJSEE+7a5Y//s8WwGm2Js2sAwpu2XpBM/VRkoZitgNn+DKwaMkEq0FzEVmtDQvBeowq63MQtixAGnOeHpjrCZLB7ilCk7nxlWSOIVhj8LUhR04sbjWcXfkkWk1xW2wwYB71MFpvA1DZHrJ9ouWTmXw3aJxOKPKquOCGVxe+BVF/jOtA/q/kt17PwVClxy4Om0+Sj2+PvPCTW4Nzf/IGvyntJwASgwYVmCkR1kdmGsUTCh8r0DjvGXH3WNhSpP/eqnUeoV+iwIpiFw11b23GkAHfJHWuMYSjmVRUpbRPgfFn2QfXD/dMg2Lg9YVv3oT6s/9GZ990N6+4Jusciqsk6uUUpinFx06ix9dXh4r794t5QchQ" } } ], From 97c40bb550ffa0155c774a412a9b93c596d79416 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:40:33 -0600 Subject: [PATCH 05/16] asdf --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index c014873..ea96404 100644 --- a/renovate.json +++ b/renovate.json @@ -13,8 +13,8 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQgAijJ3+H6KQ7iAiOMaew0PdarIld7qa+S058cIPzQi5yE+pHfULqJp5yaiuW4O2O2bkP5NLjZLeK+tQA69ev7evIak2/k6VxhdUuL60lRid4zSg9agtFFxNYbNR0LsYxH2d6kSMZB2+uwAud8xBY/VU3zMXOyiAXMFF1iMTlPC14ywME1cvbHzGD1QNv4iuozkp802dkdmUWE8McB4fdGFTd75aYVxTtcESQiMRFOM/enQe05c6AeZvWG5wGOqs3OMIS19YvRqTMB9pXqrflY8LJ1JjVohquTSbwSMiaFXSkf/zOdtNN+WB0Q8ryA12Bc5rOq4osKHHPHgBSzA5FbgWtJ0ASvqQitj6cam/suZzOW+WhN9PFREjSP2F0gXLGXmx2N8JI8ZzcEiGcIpfvUPxB+c3CAGUpNGzWIfgNYJ+zNtHH4GpUndvwwskISPIgvGO2jSxRecDjD8X5BXnV4UL0VhLbaATRURqalVf5eIyhy5D4Xrh+M", - "password": "wcBMA8xOaBJvzJNbAQf+N3ITTcvPINSMdcp81nBWPA0XhMuuBCqKdB6LjUqPH1j+ElHSeNFB1s34y7cbZ8Z74B5SAEU7UMoq7KMtRd7ROyQ3qJcpJEx43qlrW2bEiArWvYlU7n6NSUXmwIoEmVeJJSEE+7a5Y//s8WwGm2Js2sAwpu2XpBM/VRkoZitgNn+DKwaMkEq0FzEVmtDQvBeowq63MQtixAGnOeHpjrCZLB7ilCk7nxlWSOIVhj8LUhR04sbjWcXfkkWk1xW2wwYB71MFpvA1DZHrJ9ouWTmXw3aJxOKPKquOCGVxe+BVF/jOtA/q/kt17PwVClxy4Om0+Sj2+PvPCTW4Nzf/IGvyntJwASgwYVmCkR1kdmGsUTCh8r0DjvGXH3WNhSpP/eqnUeoV+iwIpiFw11b23GkAHfJHWuMYSjmVRUpbRPgfFn2QfXD/dMg2Lg9YVv3oT6s/9GZ990N6+4Jusciqsk6uUUpinFx06ix9dXh4r794t5QchQ" + "username": "wcBMA8xOaBJvzJNbAQf+Nr31I8JStgA8a6wvNNCPYTncib5dLc90FTg7YGT0x4+9sOieigDhAo4HfVBNefnqctmIg+BlD3nwUZjKL3n2U/2IFFeriCZHK8PoqQDqL/XxVjYijcqXxJAmO7JWc7/UTEGhzFyCDAiOUMQ7A2Nv5nCbbEJsaRF+jCG1sdSEyYdvTwvdvwHljmTPm9qBLoAYrXF+wyERO6OECRLJEYaxwYV4UKBqQnbUz3BKdAtbBMMjcXk1tTJEcBGg2ZALunzcFFLess6i4M24fdRTYdUtEz6/rMtvSOkWn/xenS8a+3QlzCE/agRF8o2xK502iHLn2TilLE4U8q6lEgnsj2qrF9JhAXgOQRTpOUmJpaKL2XaksQ+mnVadowh8MQOge5h1gLOj4bzD9Xe9gnAA5dRkFGLUPBqBmWj/1NnjB2zr0Xydi/Mb7GUJE5bb/kIg9jRZSYJ2Obwxd5+p/Y/x/x+ry6lFpQ", + "password": "wcBMA8xOaBJvzJNbAQgAiOePid00CGVt7LTQIiuHlufr2OQsOIe61AcSFFZeF9k5AWn6y3uSkOEDN+LBvCRsHKj6VrVKM7RPMaCcUYz3C5FZzgVCuzxRetWMQCUiLoVUbrF6YzlrcjLRswtzz5jbzaBEuqxnC4At+XpYUFmRPI1oyZnaK73WjAUwh/BF0nSCtUi1lZbaTeJwJLXYqyMrq7AmCVHTNqs/U3V9RcWGKd6Wiso/GghSL5t/ooMvbryKeKCsGJPNJBfaFh9XzJF+hLrbetRxsUwp1ofVSjgpEd0wgtBHac6uJGnFJ3ZxXlu9vWTItgV9AM6speHF7RppBIn5mm+79pXnXQNU7m8NmNJdAVZMCaq1I6rtudwiEfT4o9RNfJSUt3keydqIp6ljgJEBBaIyBox+x2Zj6gdvgcb0BjfSgOwDnEsYTIyhJsgVsbhBMr+NwQfawlF06cDKro+jdHRlx0WhcLdDONyG" } } ], From 87b8f709c7a0dcf7571c0f9efb84878930a6b58c Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:42:01 -0600 Subject: [PATCH 06/16] dsa --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index ea96404..3eb940c 100644 --- a/renovate.json +++ b/renovate.json @@ -13,7 +13,7 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQf+Nr31I8JStgA8a6wvNNCPYTncib5dLc90FTg7YGT0x4+9sOieigDhAo4HfVBNefnqctmIg+BlD3nwUZjKL3n2U/2IFFeriCZHK8PoqQDqL/XxVjYijcqXxJAmO7JWc7/UTEGhzFyCDAiOUMQ7A2Nv5nCbbEJsaRF+jCG1sdSEyYdvTwvdvwHljmTPm9qBLoAYrXF+wyERO6OECRLJEYaxwYV4UKBqQnbUz3BKdAtbBMMjcXk1tTJEcBGg2ZALunzcFFLess6i4M24fdRTYdUtEz6/rMtvSOkWn/xenS8a+3QlzCE/agRF8o2xK502iHLn2TilLE4U8q6lEgnsj2qrF9JhAXgOQRTpOUmJpaKL2XaksQ+mnVadowh8MQOge5h1gLOj4bzD9Xe9gnAA5dRkFGLUPBqBmWj/1NnjB2zr0Xydi/Mb7GUJE5bb/kIg9jRZSYJ2Obwxd5+p/Y/x/x+ry6lFpQ", + "username": "wcBMA8xOaBJvzJNbAQgAnV/M5uP5vxOxPGlMRft4dcx6DlfWaDNYBjcN/WQjVM4E5zC6STLczJG1oMMR+OeB7KFMIRBMJi0hEetA0371MnTmIYTRBiB3BIkgjqoIgRkGU4B3aho8MPV0AOVo3epgeRTyhSa+VqegEj5+u09x8B8+jTjA0ho3jYieMqXUsjqWLwFXuLowa4kR4WY0Az3LAiyIf0E1pmHotLgVF5v8+8jl7t9TLqcmVlt+lambJxfCahX/vW4JRypOKqj+hZTeg0/ybJY5/vPseXfl8ZIvPozenNuSKPnPl+6BR163aiFgc2ob6E1zC3/73oY1f/75xw4qMmLmXLcWSWk0xcQW3tJiAf38CPx9uTfoNMT0BDX3LVC9q3Bodxdi5IuasX6Wvs12EkZI/qdIfmU4+DZ0nizuPd1eNSVCPOolLPiUFFAKheWM4R2IKJic+R63vUIKhv62X4hzIaM1My/2oec9Oe5cPhY", "password": "wcBMA8xOaBJvzJNbAQgAiOePid00CGVt7LTQIiuHlufr2OQsOIe61AcSFFZeF9k5AWn6y3uSkOEDN+LBvCRsHKj6VrVKM7RPMaCcUYz3C5FZzgVCuzxRetWMQCUiLoVUbrF6YzlrcjLRswtzz5jbzaBEuqxnC4At+XpYUFmRPI1oyZnaK73WjAUwh/BF0nSCtUi1lZbaTeJwJLXYqyMrq7AmCVHTNqs/U3V9RcWGKd6Wiso/GghSL5t/ooMvbryKeKCsGJPNJBfaFh9XzJF+hLrbetRxsUwp1ofVSjgpEd0wgtBHac6uJGnFJ3ZxXlu9vWTItgV9AM6speHF7RppBIn5mm+79pXnXQNU7m8NmNJdAVZMCaq1I6rtudwiEfT4o9RNfJSUt3keydqIp6ljgJEBBaIyBox+x2Zj6gdvgcb0BjfSgOwDnEsYTIyhJsgVsbhBMr+NwQfawlF06cDKro+jdHRlx0WhcLdDONyG" } } From c8b8ebc85eea66016a08a1e417e937a137516c1e Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 08:47:55 -0600 Subject: [PATCH 07/16] test --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 3eb940c..ad4618e 100644 --- a/renovate.json +++ b/renovate.json @@ -13,8 +13,8 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQgAnV/M5uP5vxOxPGlMRft4dcx6DlfWaDNYBjcN/WQjVM4E5zC6STLczJG1oMMR+OeB7KFMIRBMJi0hEetA0371MnTmIYTRBiB3BIkgjqoIgRkGU4B3aho8MPV0AOVo3epgeRTyhSa+VqegEj5+u09x8B8+jTjA0ho3jYieMqXUsjqWLwFXuLowa4kR4WY0Az3LAiyIf0E1pmHotLgVF5v8+8jl7t9TLqcmVlt+lambJxfCahX/vW4JRypOKqj+hZTeg0/ybJY5/vPseXfl8ZIvPozenNuSKPnPl+6BR163aiFgc2ob6E1zC3/73oY1f/75xw4qMmLmXLcWSWk0xcQW3tJiAf38CPx9uTfoNMT0BDX3LVC9q3Bodxdi5IuasX6Wvs12EkZI/qdIfmU4+DZ0nizuPd1eNSVCPOolLPiUFFAKheWM4R2IKJic+R63vUIKhv62X4hzIaM1My/2oec9Oe5cPhY", - "password": "wcBMA8xOaBJvzJNbAQgAiOePid00CGVt7LTQIiuHlufr2OQsOIe61AcSFFZeF9k5AWn6y3uSkOEDN+LBvCRsHKj6VrVKM7RPMaCcUYz3C5FZzgVCuzxRetWMQCUiLoVUbrF6YzlrcjLRswtzz5jbzaBEuqxnC4At+XpYUFmRPI1oyZnaK73WjAUwh/BF0nSCtUi1lZbaTeJwJLXYqyMrq7AmCVHTNqs/U3V9RcWGKd6Wiso/GghSL5t/ooMvbryKeKCsGJPNJBfaFh9XzJF+hLrbetRxsUwp1ofVSjgpEd0wgtBHac6uJGnFJ3ZxXlu9vWTItgV9AM6speHF7RppBIn5mm+79pXnXQNU7m8NmNJdAVZMCaq1I6rtudwiEfT4o9RNfJSUt3keydqIp6ljgJEBBaIyBox+x2Zj6gdvgcb0BjfSgOwDnEsYTIyhJsgVsbhBMr+NwQfawlF06cDKro+jdHRlx0WhcLdDONyG" + "username": "wcBMA8xOaBJvzJNbAQf/coMwulv0VuOaBSkMmStswT/SshKGmu4GKSbouTjgpcZz9wT0imFZMMoLD+3chN2QIfZSfmXd9b3mXPyRULJjslvuBzb6JxRwBZSlPeQoxsruwhqot/pB5pxwZ+BorCoxRpr1550tqHipZfxVqnjipo4leKnClCkwwdGnX/TGw86UNKXO6ZcebySjM+pHkKVrVF9Bzt1dWwomSdeVwy47o7lXFHcYyYKTPhW6mFqhqI7xelVjkMEEto5byS+kZNxS7vsE+olXXnmXSbGx9x8TpIvRbZb8jcLBcPkq83qaBYsnvmuq7BYMzpsTzUMpwfpRrPMJiiYghHtN++BVIJ9QxdJ1AdeqFT5ib+yj+hpKqeBfddZ9tth/s3dDkpW162NHdo8mELiC9V9+DxgpP0bysk9rV/zdB0m/78iI3KfGzptwX+cjVAsaAdRvjpsudVTVN4TZt+qGB7MCBuskoU9WNW37r0a2t5XHFGYCR93TZTebwz59304r", + "password": "wcBMA8xOaBJvzJNbAQf+Oy0vlS8DyNVcwgMFKUPkL2lmWIQMrGCkl8QYNN6H8iQ3wW5/vxnuDjCzttjSxzKPaogOLAp9eH8ITLmkWCS0/3I5UjtT+GLmN4C6EIvvof3muJbu4qb7zF6e6/V56zFunAB7MaBhNwBwVmTdcNLBqzH8we/ld63jcH+iEd75FQaVVXCy5k7DssP/0JSmDvkmkTI4qPVHZEVoEPgy58aIJIPVO0hsmQsEaPj6Svd5rXmOkZEP55ObjpVvTxNa5MQY8CHBmtDaDNSEN9/oboI89YC1uP5iywV5nFG9eEeaFKL2gnTRW47iLmZzLNpzxXjWw6T7WrK/O3rTNU/NDpjmwtJwAVsOt1QrBxE2A4N+2hhlotUgURmIer9pQNxIN6J2XMd5qSPd5G8kdboH45dkhN/4ltwbw8g/ZEUwvPjHv4hgyCTnSpyDqmaws52XlyQPR345QVzPw6Bjgog2Q0gTLEC9LvBks4ZkQ4Xz4MKtIHgLgA" } } ], From e00ecee68718dddbdff316b4ca0e0af058e61f3e Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:04:10 -0600 Subject: [PATCH 08/16] test again --- renovate.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/renovate.json b/renovate.json index ad4618e..07edc6e 100644 --- a/renovate.json +++ b/renovate.json @@ -7,17 +7,6 @@ "replacements:all", "workarounds:all" ], - "hostRules": [ - { - "matchHost": "registry1.dso.mil", - "hostType": "docker", - "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", - "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQf/coMwulv0VuOaBSkMmStswT/SshKGmu4GKSbouTjgpcZz9wT0imFZMMoLD+3chN2QIfZSfmXd9b3mXPyRULJjslvuBzb6JxRwBZSlPeQoxsruwhqot/pB5pxwZ+BorCoxRpr1550tqHipZfxVqnjipo4leKnClCkwwdGnX/TGw86UNKXO6ZcebySjM+pHkKVrVF9Bzt1dWwomSdeVwy47o7lXFHcYyYKTPhW6mFqhqI7xelVjkMEEto5byS+kZNxS7vsE+olXXnmXSbGx9x8TpIvRbZb8jcLBcPkq83qaBYsnvmuq7BYMzpsTzUMpwfpRrPMJiiYghHtN++BVIJ9QxdJ1AdeqFT5ib+yj+hpKqeBfddZ9tth/s3dDkpW162NHdo8mELiC9V9+DxgpP0bysk9rV/zdB0m/78iI3KfGzptwX+cjVAsaAdRvjpsudVTVN4TZt+qGB7MCBuskoU9WNW37r0a2t5XHFGYCR93TZTebwz59304r", - "password": "wcBMA8xOaBJvzJNbAQf+Oy0vlS8DyNVcwgMFKUPkL2lmWIQMrGCkl8QYNN6H8iQ3wW5/vxnuDjCzttjSxzKPaogOLAp9eH8ITLmkWCS0/3I5UjtT+GLmN4C6EIvvof3muJbu4qb7zF6e6/V56zFunAB7MaBhNwBwVmTdcNLBqzH8we/ld63jcH+iEd75FQaVVXCy5k7DssP/0JSmDvkmkTI4qPVHZEVoEPgy58aIJIPVO0hsmQsEaPj6Svd5rXmOkZEP55ObjpVvTxNa5MQY8CHBmtDaDNSEN9/oboI89YC1uP5iywV5nFG9eEeaFKL2gnTRW47iLmZzLNpzxXjWw6T7WrK/O3rTNU/NDpjmwtJwAVsOt1QrBxE2A4N+2hhlotUgURmIer9pQNxIN6J2XMd5qSPd5G8kdboH45dkhN/4ltwbw8g/ZEUwvPjHv4hgyCTnSpyDqmaws52XlyQPR345QVzPw6Bjgog2Q0gTLEC9LvBks4ZkQ4Xz4MKtIHgLgA" - } - } - ], "packageRules": [ { "datasources": ["helm"], From 4b5ba714a6d7566cacd0f93ebabfcafc96337fa1 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:12:19 -0600 Subject: [PATCH 09/16] change --- renovate.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/renovate.json b/renovate.json index 07edc6e..15bdc68 100644 --- a/renovate.json +++ b/renovate.json @@ -7,6 +7,17 @@ "replacements:all", "workarounds:all" ], + "hostRules": [ + { + "matchHost": "registry1.dso.mil", + "hostType": "docker", + "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", + "encrypted": { + "username": "wcBMA8xOaBJvzJNbAQf/QQ1eaG6t7RBuRp53suFquqDfiAqG/QtYQ1vUvlFmVYUnLo9kpmKzad9d/7WKwGMNCY3kjvQGRZYmd2/WW+ZNJAGTEPUDBcpOCHyQtc/o8xpZr1qOYT2yIBGSL8vcdFRypq7eyOZmLJiRcpO4qAUrhGfDXWsowZYfqKFyw4dvzs5Pq6fv1G88o5TIdlYQJ5AsMtGP5kUi0NKvwgGtYf6DBjXD/BFRFYmy2NpVbRWfQ7IbOkHphotXNIJJAIaztzdzTVFBo1RylHEoygP69u14c/uQbcCrGpLPH5HLZsGlsAAXN0+xrTrYMEVYGdzuZ//UF1cmrgPEdjBhOqGoXunk09J1ARTGUXcD2XuOmqi43as+EQ5hx4eQe6EUHE1ZkTQGVzZvWfcoHLUwQF4oRxSyIMr1eTKtoZc08/F9wSRfgnblyAuNfOCNrzb0cPN9MFD9/mkrIHTpnX9KeXAZbgHEkQHUHa8ikW18POury6MW5w8tVZ5K3VVT", + "password": "wcBMA8xOaBJvzJNbAQgAjc0zQHC60jYz17phbMNbLU6wUWlLBflbImBolyRGxchFtCOnf0LjPeWV4fohvuIG2GnQ+xl3AdNKw1vGSzqk0/lG6Wj7NRQer2WlYysqap1L4+648Zly2CEI4CR/29Q613D2pjo9y4z98m7dbWB5r9rUQ9fZ8nl/vOxBygbeLCXkMs+mn24bcH1zYxaShIWOQWl9I3N+hR35DhJ96q/g9H4RlmS/XvoJS66QysMMtMs2UP3CLOSvWRCCCD8QhAPhhovlHtH+lxEbsNa5wF5qLpHxVxpB5Onmvuy3yRzh1eqA7GKxAkSy3xadvEbLhlWKtQMAbA/jA+aEaz5FR3E4FdJwATN8X7wsElBhGIuy0rZVKRMeaeDE2oYPsVmpOpvJrkeHLBc1bpyGrLzY5K8UIO09f4wgEbOfbif79plBVcZKjeIFXivBBjOxUk1BaYs+3VWgDji681OOEEMvQ+qfRcu+CgDnRjwlSX8KabR3Cx6OdQ" + } + } + ], "packageRules": [ { "datasources": ["helm"], From 463911bf6e912498fd2089c98e218ba9841ad8c3 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:20:16 -0600 Subject: [PATCH 10/16] update --- renovate.json | 211 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 194 insertions(+), 17 deletions(-) diff --git a/renovate.json b/renovate.json index 15bdc68..7f06d16 100644 --- a/renovate.json +++ b/renovate.json @@ -1,12 +1,32 @@ { + "enabled": true, + "forkProcessing": "enabled", + "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>defenseunicorns/uds-common//config/renovate.json5", - ":semanticCommits", - ":semanticPrefixFixDepsChoreOthers", - "group:all", - "replacements:all", - "workarounds:all" + ":dependencyDashboard", + "config:base", + "helpers:pinGitHubActionDigests" ], + "reviewersFromCodeOwners": false, + "timezone": "America/New_York", + "rebaseStalePrs": true, + "dependencyDashboard": true, + "dependencyDashboardTitle": "Renovate Dashboard 🤖", + "rebaseWhen": "conflicted", + "commitBodyTable": true, + "suppressNotifications": ["prIgnoreNotification"], + "pre-commit": { + "enabled": true + }, + "helm-values": { + "fileMatch": [".*\\.ya?ml$"] + }, + "kubernetes": { + "fileMatch": [".*\\.ya?ml$"], + "ignorePaths": [ + ".github" + ] + }, "hostRules": [ { "matchHost": "registry1.dso.mil", @@ -18,7 +38,174 @@ } } ], + "regexManagers": [ + { + "fileMatch": [".*(\\.ya?ml|\\.json)$"], + "matchStrings": [ + "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/(?[^\\/]+)" + ], + "versioningTemplate": "semver-coerced", + "datasourceTemplate": "github-tags" + }, + { + "fileMatch": [".*(\\.ya?ml|\\.json)$"], + "matchStrings": [ + "https:\\/\\/github\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/raw\\/(?[^\\/]+)" + ], + "versioningTemplate": "semver-coerced", + "datasourceTemplate": "github-tags" + }, + { + "fileMatch": [".*(\\.ya?ml|\\.json)$"], + "matchStrings": [ + "https:\\/\\/github\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/releases\\/download\\/(?[^\\/]+)" + ], + "versioningTemplate": "semver-coerced", + "datasourceTemplate": "github-tags" + }, + { + "fileMatch": [".*(\\.ya?ml|\\.json)$"], + "matchStrings": [ + "npm install ([\\w\\- ]+ )?(?@?[^\\s]*?)@(?[^\\s]+)" + ], + "datasourceTemplate": "npm" + }, + { + "fileMatch": [".*\\.ya?ml$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*:\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" + }, + { + "fileMatch": [".*\\.ya?ml$", ".*\\.sh$", ".*\\.?Dockerfile$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*[A-Z]+=['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" + }, + { + "fileMatch": [".*\\.ya?ml$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s.*brew.*@\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", + "extractVersionTemplate": "^v(?.*)$" + }, + { + "fileMatch": ["\\.*\\.ya?ml$"], + "matchStrings": [ + "# renovate: image=(?.*?)\\s*image:\\s.*:(?[^\\s\"]*)" + ], + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStrings": [ + "- ['\"]?(?[^\"'\\s]+):(?[^\"'\\s]+)['\"]?( # renovate:( versioning=(?.*?))?( extractVersion=(?.*?))?)?(\\s|$)" + ], + "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}docker{{/if}}", + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name: [\"']?(?.+?)[\"']?$(.|\\n)*?version: [\"']?(?.+?)[\"']?$(.|\\n)*?url: [\"']?(?(https|http|file):\\/\\/.+?)[\"']?$" + ], + "datasourceTemplate": "helm" + }, + { + "fileMatch": [ "(^|/)zarf.yaml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name: [\"']?(?.+?)[\"']?$(.|\\n)*?url: [\"']?(?(https|http|file):\\/\\/.+?)[\"']?$(.|\\n)*?version: [\"']?(?.+?)[\"']?$" + ], + "datasourceTemplate": "helm" + }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name:(.|\\n)*?version: [\"']?(?.+?)[\"']?$(.|\\n)*?url: [\"']?(?.+?\\.git)[\"']?$" + ], + "datasourceTemplate": "git-tags", + "versioningTemplate": "regex:^v?(?\\d+)\\.(?\\d+)\\.(?\\d+)(-[\\w\\.]+\\.(?\\d+))?" + }, + { + "fileMatch": [ "(^|/)zarf.yaml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name:(.|\\n)*?url: [\"']?(?.+?\\.git)[\"']?$(.|\\n)*?version: [\"']?(?.+?)[\"']?$" + ], + "datasourceTemplate": "git-tags", + "versioningTemplate": "regex:^v?(?\\d+)\\.(?\\d+)\\.(?\\d+)(-[\\w\\.]+\\.(?\\d+))?" + }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name:(.|\\n)*?version: [\"']?(?.+?)[\"']?$(.|\\n)*?url: [\"']?oci:\\/\\/(?.+?)[\"']?$" + ], + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ "(^|/)zarf.yaml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name:(.|\\n)*?url: [\"']?oci:\\/\\/(?.+?)[\"']?$(.|\\n)*?version: [\"']?(?.+?)[\"']?$" + ], + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)manifests:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)", + "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", + "(?m)name:(.|\\n)*?kustomizations:(.|\n)*?- [\"']?github.com\\/(?.+?)\\/\\/.*\\?ref=(?.+?)[\"']?$" + ], + "versioningTemplate": "semver-coerced", + "datasourceTemplate": "github-tags" + }, + { + "fileMatch": [ "(^|/)uds-bundle.yaml$" ], + "matchStringsStrategy": "recursive", + "matchStrings": [ + "(?m)repository: [\"']?(?.+?)[\"']?$(.)*(\n.*){0,2}ref: [\"']?(?.+?)[\"']?$" + ], + "datasourceTemplate": "docker", + "versioning": "regex:^v?(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?(-uds\\.(?\\d)(-.*?)?)?(.*?)?$" + }, + { + "fileMatch": ["^tasks.ya?ml$", "^tasks/.*\\.ya?ml$", "^\\.vscode/settings\\.json$"], + "matchStrings": [ + "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/(?[^\\/]+)" + ], + "versioningTemplate": "semver-coerced", + "datasourceTemplate": "github-tags" + } + ], "packageRules": [ + { + "matchPackageNames": ["registry1.dso.mil/ironbank/big-bang/base"], + "allowedVersions": "!/8.4/" + }, { "datasources": ["helm"], "commitMessageTopic": "Helm chart {{depName}}", @@ -71,15 +258,5 @@ "matchPaths": ["src/plugin/pom.xml"], "groupName": "keycloak-updates" } - ], - "regexManagers":[ - { - "fileMatch": ["^tasks.ya?ml$", "^tasks/.*\\.ya?ml$", "^\\.vscode/settings\\.json$"], - "matchStrings": [ - "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/(?[^\\/]+)" - ], - "versioningTemplate": "semver-coerced", - "datasourceTemplate": "github-tags" - } ] -} +} \ No newline at end of file From 6b9be3a6d214b804f9b50e592bd8d1ab09bb3caf Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:23:09 -0600 Subject: [PATCH 11/16] dsa --- renovate.json | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/renovate.json b/renovate.json index 7f06d16..7fce0f4 100644 --- a/renovate.json +++ b/renovate.json @@ -70,30 +70,6 @@ ], "datasourceTemplate": "npm" }, - { - "fileMatch": [".*\\.ya?ml$"], - "matchStrings": [ - "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*:\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", - "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" - }, - { - "fileMatch": [".*\\.ya?ml$", ".*\\.sh$", ".*\\.?Dockerfile$"], - "matchStrings": [ - "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*[A-Z]+=['\"]?(?[v0-9].*?)['\"]?(\\s|$)" - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", - "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" - }, - { - "fileMatch": [".*\\.ya?ml$"], - "matchStrings": [ - "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s.*brew.*@\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}", - "extractVersionTemplate": "^v(?.*)$" - }, { "fileMatch": ["\\.*\\.ya?ml$"], "matchStrings": [ @@ -101,15 +77,6 @@ ], "datasourceTemplate": "docker" }, - { - "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], - "matchStrings": [ - "- ['\"]?(?[^\"'\\s]+):(?[^\"'\\s]+)['\"]?( # renovate:( versioning=(?.*?))?( extractVersion=(?.*?))?)?(\\s|$)" - ], - "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}docker{{/if}}", - "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], "matchStringsStrategy": "recursive", From 9f3ba935df02ce83ea8f4f5c159c70f61e566b6d Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:24:49 -0600 Subject: [PATCH 12/16] fus --- renovate.json | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/renovate.json b/renovate.json index 7fce0f4..31e8d49 100644 --- a/renovate.json +++ b/renovate.json @@ -44,7 +44,6 @@ "matchStrings": [ "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/(?[^\\/]+)" ], - "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" }, { @@ -52,7 +51,6 @@ "matchStrings": [ "https:\\/\\/github\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/raw\\/(?[^\\/]+)" ], - "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" }, { @@ -60,7 +58,6 @@ "matchStrings": [ "https:\\/\\/github\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/releases\\/download\\/(?[^\\/]+)" ], - "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" }, { @@ -70,6 +67,27 @@ ], "datasourceTemplate": "npm" }, + { + "fileMatch": [".*\\.ya?ml$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*:\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" + }, + { + "fileMatch": [".*\\.ya?ml$", ".*\\.sh$", ".*\\.?Dockerfile$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?( extractVersion=(?.*?))?( registryUrl=(?.*?))?\\s.*[A-Z]+=['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}" + }, + { + "fileMatch": [".*\\.ya?ml$"], + "matchStrings": [ + "# renovate: datasource=(?.*?) depName=(?.*?)( versioning=(?.*?))?\\s.*brew.*@\\s*['\"]?(?[v0-9].*?)['\"]?(\\s|$)" + ], + "extractVersionTemplate": "^v(?.*)$" + }, { "fileMatch": ["\\.*\\.ya?ml$"], "matchStrings": [ @@ -77,6 +95,14 @@ ], "datasourceTemplate": "docker" }, + { + "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], + "matchStrings": [ + "- ['\"]?(?[^\"'\\s]+):(?[^\"'\\s]+)['\"]?( # renovate:( versioning=(?.*?))?( extractVersion=(?.*?))?)?(\\s|$)" + ], + "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?.*)${{/if}}", + "datasourceTemplate": "docker" + }, { "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], "matchStringsStrategy": "recursive", @@ -105,8 +131,7 @@ "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", "(?m)name:(.|\\n)*?version: [\"']?(?.+?)[\"']?$(.|\\n)*?url: [\"']?(?.+?\\.git)[\"']?$" ], - "datasourceTemplate": "git-tags", - "versioningTemplate": "regex:^v?(?\\d+)\\.(?\\d+)\\.(?\\d+)(-[\\w\\.]+\\.(?\\d+))?" + "datasourceTemplate": "git-tags" }, { "fileMatch": [ "(^|/)zarf.yaml$" ], @@ -116,8 +141,7 @@ "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", "(?m)name:(.|\\n)*?url: [\"']?(?.+?\\.git)[\"']?$(.|\\n)*?version: [\"']?(?.+?)[\"']?$" ], - "datasourceTemplate": "git-tags", - "versioningTemplate": "regex:^v?(?\\d+)\\.(?\\d+)\\.(?\\d+)(-[\\w\\.]+\\.(?\\d+))?" + "datasourceTemplate": "git-tags" }, { "fileMatch": [ "(^|/)zarf\\.ya?ml$" ], @@ -147,7 +171,6 @@ "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-|^\\s{6}-)", "(?m)name:(.|\\n)*?kustomizations:(.|\n)*?- [\"']?github.com\\/(?.+?)\\/\\/.*\\?ref=(?.+?)[\"']?$" ], - "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" }, { @@ -156,15 +179,13 @@ "matchStrings": [ "(?m)repository: [\"']?(?.+?)[\"']?$(.)*(\n.*){0,2}ref: [\"']?(?.+?)[\"']?$" ], - "datasourceTemplate": "docker", - "versioning": "regex:^v?(?\\d+)(\\.(?\\d+))?(\\.(?\\d+))?(-uds\\.(?\\d)(-.*?)?)?(.*?)?$" + "datasourceTemplate": "docker" }, { "fileMatch": ["^tasks.ya?ml$", "^tasks/.*\\.ya?ml$", "^\\.vscode/settings\\.json$"], "matchStrings": [ "https:\\/\\/raw\\.githubusercontent\\.com\\/(?[^\\/]+\\/[^\\/]+)\\/(?[^\\/]+)" ], - "versioningTemplate": "semver-coerced", "datasourceTemplate": "github-tags" } ], From aa971a33a6d16fd684dc4cf7314db7c46902f0a4 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:26:20 -0600 Subject: [PATCH 13/16] fix --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 31e8d49..2d0fe3b 100644 --- a/renovate.json +++ b/renovate.json @@ -33,8 +33,8 @@ "hostType": "docker", "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQf/QQ1eaG6t7RBuRp53suFquqDfiAqG/QtYQ1vUvlFmVYUnLo9kpmKzad9d/7WKwGMNCY3kjvQGRZYmd2/WW+ZNJAGTEPUDBcpOCHyQtc/o8xpZr1qOYT2yIBGSL8vcdFRypq7eyOZmLJiRcpO4qAUrhGfDXWsowZYfqKFyw4dvzs5Pq6fv1G88o5TIdlYQJ5AsMtGP5kUi0NKvwgGtYf6DBjXD/BFRFYmy2NpVbRWfQ7IbOkHphotXNIJJAIaztzdzTVFBo1RylHEoygP69u14c/uQbcCrGpLPH5HLZsGlsAAXN0+xrTrYMEVYGdzuZ//UF1cmrgPEdjBhOqGoXunk09J1ARTGUXcD2XuOmqi43as+EQ5hx4eQe6EUHE1ZkTQGVzZvWfcoHLUwQF4oRxSyIMr1eTKtoZc08/F9wSRfgnblyAuNfOCNrzb0cPN9MFD9/mkrIHTpnX9KeXAZbgHEkQHUHa8ikW18POury6MW5w8tVZ5K3VVT", - "password": "wcBMA8xOaBJvzJNbAQgAjc0zQHC60jYz17phbMNbLU6wUWlLBflbImBolyRGxchFtCOnf0LjPeWV4fohvuIG2GnQ+xl3AdNKw1vGSzqk0/lG6Wj7NRQer2WlYysqap1L4+648Zly2CEI4CR/29Q613D2pjo9y4z98m7dbWB5r9rUQ9fZ8nl/vOxBygbeLCXkMs+mn24bcH1zYxaShIWOQWl9I3N+hR35DhJ96q/g9H4RlmS/XvoJS66QysMMtMs2UP3CLOSvWRCCCD8QhAPhhovlHtH+lxEbsNa5wF5qLpHxVxpB5Onmvuy3yRzh1eqA7GKxAkSy3xadvEbLhlWKtQMAbA/jA+aEaz5FR3E4FdJwATN8X7wsElBhGIuy0rZVKRMeaeDE2oYPsVmpOpvJrkeHLBc1bpyGrLzY5K8UIO09f4wgEbOfbif79plBVcZKjeIFXivBBjOxUk1BaYs+3VWgDji681OOEEMvQ+qfRcu+CgDnRjwlSX8KabR3Cx6OdQ" + "username": "wcBMA8xOaBJvzJNbAQgAm6vTHed3Fwluedbpt+xNHWx0mxZLj97/sB5RJejfxcTUKjtTzI0X4fwZbOI3ZQwW9Q9dAGHNFYJf4z8KU7ErzKR9wBR+N/HUw5oqVItQwqCecEduda9DPz3c1MdgMrwXgA7T5SdU9a0QxLQ8WLcDzpOqM7NvEYPmt0tDwgVNXW3LWP+NIluLeyT/PMKoeNuP7WISlRBe7s22fXF+RQdgy5PQy9KHafEmfOiTi8rbLgVskAa1Chm3GlD2474fUdXrQcRETaza2H2eDkyJl642PYGtcEb2Rl9GbVa0TVVjpwDjk6RsJETS9mmbexXVYorwu1wwW0KVXbq2v1K1te94FdJiATjj0K6M96XLdV22J5XRWzaNdwQExEF/v3molvm9F69JIbQBGK32uzNY+tDKpOR3FR/llOUVDM0Y/1CMqO50SvRqfi/LybfRPKGjlm9uxOqBUxYcGgdVziyU9YYqoYxMl8c", + "password": "wcBMA8xOaBJvzJNbAQf/a69wud1zqj4DU6nSmsJKltjvhmXhgUNCgzVPh/IgGpnwvZdL8E2SyDdU3i7t9Dc3ZNS4o5ikxrkqOJn/qgvUk8CU3CBbI6D9tuIStaBdE8EZuBt9etwGpEex/OjnopOllr6lEFVoFPV4hseHKnhKGxtIZxdeOe5RGo9RXESChuC59/jd87mZ8mVZBKOOknNxAc1ifKOuixvfyCHusxDWL/GSpBhn9WZzoI91+JUXzQPxOZFVusc0wA096BN3xtykSBJg0Pn8uS5OE/zVErNrPKMTsjMTjf7AgPwdtOw24zBBBhIJECZVCCjdbus2ClOIVgAPrE4w+7BtG/QpZ/z/etJdAUwCSlB9dD9cLuQdWMLCH4wPst1HQjGmg+0K8H++a+L1Sy1uaCaD51MP04h7HWpFuo4wVMOgiPEMMRyg7l8gTDA0sJ9ZtFtay0eJYndLM6lx9RjIteFavVxzKFkJ" } } ], From 60b664a04fd1ba1ccbf6fc51d42339f32fc98db5 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:28:25 -0600 Subject: [PATCH 14/16] test --- renovate.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/renovate.json b/renovate.json index 2d0fe3b..babc15f 100644 --- a/renovate.json +++ b/renovate.json @@ -27,17 +27,6 @@ ".github" ] }, - "hostRules": [ - { - "matchHost": "registry1.dso.mil", - "hostType": "docker", - "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted", - "encrypted": { - "username": "wcBMA8xOaBJvzJNbAQgAm6vTHed3Fwluedbpt+xNHWx0mxZLj97/sB5RJejfxcTUKjtTzI0X4fwZbOI3ZQwW9Q9dAGHNFYJf4z8KU7ErzKR9wBR+N/HUw5oqVItQwqCecEduda9DPz3c1MdgMrwXgA7T5SdU9a0QxLQ8WLcDzpOqM7NvEYPmt0tDwgVNXW3LWP+NIluLeyT/PMKoeNuP7WISlRBe7s22fXF+RQdgy5PQy9KHafEmfOiTi8rbLgVskAa1Chm3GlD2474fUdXrQcRETaza2H2eDkyJl642PYGtcEb2Rl9GbVa0TVVjpwDjk6RsJETS9mmbexXVYorwu1wwW0KVXbq2v1K1te94FdJiATjj0K6M96XLdV22J5XRWzaNdwQExEF/v3molvm9F69JIbQBGK32uzNY+tDKpOR3FR/llOUVDM0Y/1CMqO50SvRqfi/LybfRPKGjlm9uxOqBUxYcGgdVziyU9YYqoYxMl8c", - "password": "wcBMA8xOaBJvzJNbAQf/a69wud1zqj4DU6nSmsJKltjvhmXhgUNCgzVPh/IgGpnwvZdL8E2SyDdU3i7t9Dc3ZNS4o5ikxrkqOJn/qgvUk8CU3CBbI6D9tuIStaBdE8EZuBt9etwGpEex/OjnopOllr6lEFVoFPV4hseHKnhKGxtIZxdeOe5RGo9RXESChuC59/jd87mZ8mVZBKOOknNxAc1ifKOuixvfyCHusxDWL/GSpBhn9WZzoI91+JUXzQPxOZFVusc0wA096BN3xtykSBJg0Pn8uS5OE/zVErNrPKMTsjMTjf7AgPwdtOw24zBBBhIJECZVCCjdbus2ClOIVgAPrE4w+7BtG/QpZ/z/etJdAUwCSlB9dD9cLuQdWMLCH4wPst1HQjGmg+0K8H++a+L1Sy1uaCaD51MP04h7HWpFuo4wVMOgiPEMMRyg7l8gTDA0sJ9ZtFtay0eJYndLM6lx9RjIteFavVxzKFkJ" - } - } - ], "regexManagers": [ { "fileMatch": [".*(\\.ya?ml|\\.json)$"], From 28e53e9176b4f9a101c7dbc7f86d068a9d48b508 Mon Sep 17 00:00:00 2001 From: UnicornChance Date: Tue, 16 Jul 2024 09:33:48 -0600 Subject: [PATCH 15/16] test --- bundles/uds-bundle.yaml | 2 +- tasks.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/uds-bundle.yaml b/bundles/uds-bundle.yaml index 114a5be..047a23f 100644 --- a/bundles/uds-bundle.yaml +++ b/bundles/uds-bundle.yaml @@ -22,7 +22,7 @@ packages: - name: core-slim-dev path: ../uds-core/build/ # renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver - ref: 0.24.0 + ref: 0.23.0 overrides: keycloak: keycloak: diff --git a/tasks.yaml b/tasks.yaml index 9010017..5856629 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -12,7 +12,7 @@ variables: - name: CORE_VERSION description: UDS Core Version for Releases and Clone # renovate: datasource=github-tags depName=defenseunicorns/uds-core versioning=semver - default: "v0.24.0" + default: "v0.23.0" tasks: - name: build-and-publish From e6cbfc0b3199daead221f3da4522652b61f5ff7f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:49:11 +0000 Subject: [PATCH 16/16] chore(deps): update keycloak-updates | datasource | package | from | to | | ---------- | ----------------------------------------------------- | ------- | ------- | | maven | org.apache.maven.plugins:maven-surefire-report-plugin | 3.2.5 | 3.4.0 | | maven | org.apache.maven.plugins:maven-surefire-plugin | 3.2.5 | 3.4.0 | | maven | org.apache.maven.plugins:maven-jar-plugin | 3.4.1 | 3.4.2 | | maven | org.projectlombok:lombok | 1.18.32 | 1.18.34 | --- src/plugin/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugin/pom.xml b/src/plugin/pom.xml index fe05182..a4ed36a 100644 --- a/src/plugin/pom.xml +++ b/src/plugin/pom.xml @@ -49,7 +49,7 @@ org.projectlombok lombok - 1.18.32 + 1.18.34 org.powermock @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.4.0 ${surefireArgLine} @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 3.2.5 + 3.4.0 generate-report