From 983ac2748498f2fb14c3c013aa85c8d4c04bedb8 Mon Sep 17 00:00:00 2001 From: rverdile Date: Thu, 17 Apr 2025 13:10:53 -0400 Subject: [PATCH] cloudapi/v2: add insights proxy to subscription image options --- internal/cloudapi/v2/compose.go | 5 ++ internal/cloudapi/v2/openapi.v2.gen.go | 88 ++++++++++++++------------ internal/cloudapi/v2/openapi.v2.yml | 5 ++ 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/internal/cloudapi/v2/compose.go b/internal/cloudapi/v2/compose.go index b05cbdbe2..9682d4763 100644 --- a/internal/cloudapi/v2/compose.go +++ b/internal/cloudapi/v2/compose.go @@ -1126,6 +1126,10 @@ func (request *ComposeRequest) GetSubscription() (sub *subscription.ImageOptions if request.Customizations.Subscription.Rhc != nil { rhc = *request.Customizations.Subscription.Rhc } + var insightsClientProxy string + if request.Customizations.Subscription.InsightsClientProxy != nil { + insightsClientProxy = *request.Customizations.Subscription.InsightsClientProxy + } sub = &subscription.ImageOptions{ Organization: request.Customizations.Subscription.Organization, ActivationKey: request.Customizations.Subscription.ActivationKey, @@ -1133,6 +1137,7 @@ func (request *ComposeRequest) GetSubscription() (sub *subscription.ImageOptions BaseUrl: request.Customizations.Subscription.BaseUrl, Insights: request.Customizations.Subscription.Insights, Rhc: rhc, + Proxy: insightsClientProxy, } } diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go index f245907de..6f3f70630 100644 --- a/internal/cloudapi/v2/openapi.v2.gen.go +++ b/internal/cloudapi/v2/openapi.v2.gen.go @@ -1380,7 +1380,10 @@ type Subscription struct { ActivationKey string `json:"activation_key"` BaseUrl string `json:"base_url"` Insights bool `json:"insights"` - Organization string `json:"organization"` + + // InsightsClientProxy Optional value to set proxy option when registering the system to Insights + InsightsClientProxy *string `json:"insights_client_proxy,omitempty"` + Organization string `json:"organization"` // Rhc Optional flag to use rhc to register the system, which also always enables Insights. Rhc *bool `json:"rhc,omitempty"` @@ -3237,47 +3240,48 @@ var swaggerSpec = []string{ "+iQ/oc4I6E4Sb5BbHs6Jnhpw7QcoaekupZ9SgGQlNKSnQrP5xsD4kA/XhUW2XQmJLsmyKVasR0PSXTbv", "KFyjiLceIekL02ehg5hwN+gsmy/zpi1wE87zHKNuGOcFL30PZKZs9nd6HOeGWQz97ELnr1tCQZ/NY1lw", "5lZw+RE/uwu7lldu9cucAeUbjJq6n5wB1hF4pGtzGmUhlbnNkcOQyMlPCQ1UxeZTZqXdLuTo2erPm3fn", - "raHVRgEaqeEWVRWkrA9JwlGbDCWvFivlqj0+yVmt8sX3YT0P9qMaLWzg6KpBOqQkUS4yKqsCPU7NuwxG", - "QHHQMiuaUVoXrSldPzP5iuF0W/OSVxOIXYnXmcMkhbfsLE2kYEhscGJzbIfQbaK4/gYBx1G3FSHHRAQa", - "qiXhwUQEIGqUMg+KeUKZGOSgjxh2YD6g1MsTEUjzLJPNlJZ93sieSD4wsDjeI2qVjQ4MdYjc3TZTCu1d", - "u3AAJZ2R9ZI35u/jyGTtN/tnE4NX9mlXNusyV8Zp5RxvIUObdVnwwOSqbpb4/lVd5iJqV3VYdG367Ytd", - "8kQms34deD5rWpUrwhzwAQ09FzCkwte66qWWy55S3ec3SSehq2B4obJeLXufB2pcH0FiImWh5wFLQ6Ap", - "j3cIZEgLPm0Sz80L47ZGSo4wVTFD+kpJAtwhLPSQfreFoR5lKAvGCAzgKC6QpagZqKRcubouAnAMo/K0", - "WADMyQfRIQHlHHd1kLaPX1Wgpg+FM9B3W2Y/gKB9ZchLoRzzzqKr10Ry/Xo39El0xQmaa7PUmj1mC7Rs", - "wFBr9rA/Sro2b6zZfsEF+AZcG/X4snYSb7JfnMW7Tr0KUxRAF6xY9LayiQOJyObLDIFtmHXLQkIWpdam", - "ahTM0e3GC/rBchL2cJiZIb8sPLoWpwjneSXOzY0ygZPptNTBeSNidGk0icDQC/KmoIh5qsyOQuN72qQs", - "UPwWnsXMUx9L67z4Oqd/r+Vsu2BHpwfs/BF/Oj+/G4fH8KZx4t+c0dbbTa/8db/s7tfeinu3r4Wt12Xp", - "NclsLMRKdgeT0frnlJlWFB+qGwAuIFMx1WIAftv6LQt+q/2mkhV+K3d/i58v6yIgt0cF23cIJAARh00C", - "oRwqeqQ8uJRSeYwTr551ERDmvWVVyHpa5LxD4n7pMOzF9sq68YDJOKg5vjJpTM86jWl9v1Y6HcxCEZsn", - "YNmDJvUMyWdtfrfHu/cRQUyhFvcA9bEQyP24ML3lvbTzTKhgJKjsD93N0Nos1djILkEAU03DUgH9u+qd", - "W0dSPKtSWkKCBU8nn4EjvDe/flXjXb0dgcWkLWlS88AegkzL0q7612HEjicPt9KoVC2lsavbxeMOhAgy", - "374p479HbTmluiaioOYWSNUm1QHpumYLz2dSwdWaKzKNADoDBMoqn1wZ1PFt4Xg8zkP1WV3Rmb68cNZq", - "Hly0D3LlfDE/EL6njTqh0HHZ3lPTm+ohDKjinwAGOBHtuZspR09dyg+7mUq+mC9ldPl/haaC41GCeOFP", - "7H5Tp4mtPO2RIXytU6hCtcAoApJOVVoKEtHj6tr5rFLLVBkaYxzoF8YSt1aUKUaZVtVRFeYkIykVBLm6", - "jEv8fEvL1aA0JcTtSL0JIIM+EsoUnyPP1n5cGysCXlDQVwVyMVGyWQyiINldnYM05RLtFNFyLn1KlcoV", - "VK1tbedQfaebK5XdSg5Wa1u5anlrq1arVovFYnF1Jo40t5jx/KvNKBeLiUxDU+zBM9FchRfz+s0UoKXq", - "cgJLipzTmEniRJJI9SdObWrYzE/aItooM5QBsKunLv36qRuhetliiNTFKNaA6Nkrv372OzK925QUGCAm", - "aQPEtK0hqf4VkAwJHZOZLaj9Fbt/R9BroPPZVF0kQB31ALGbSYpwxcWR8P7HF8kjcV6JOtuTQkgJr5ie", - "1DiF6A/1QAC3pcDqypgQEDSOumZBQOXScZR4x00VbnW3MkIMRsJdyXvjAkHQGUyf1ko4RPi84LqiXBhZ", - "bYQM4mKPupOfx/F69Oie+Fv6yJfC7NucvCn97Nlbrm3rzUdVCk6p58j9lwkdFuHnXfK8S561JY8RGjZJ", - "wwsrFafo/Yeoh3ItTqJ6frH+lDWCRaVVKieBNBLgSH6hDPTUfb9dJ9IDn+kHsH6dUpGYxoLn2WW+89g7", - "j214us+TUIrTfo6ZsoFlEmFyhUmSLOG4nlESD/x/zCxJYcpCR2m8vJsm78Lrb2qaWDUFKb+0yyVpn1gs", - "Bdlkai6sIU8SwurfSIr8AisngRk18F9t5yTmj8M2LSSlimOj8fQVj66qIa1fUVhg/Qj0Kgr6Hb4UPLOo", - "XVt6VX/WBDbe/JbSjyVaUu9XLWEAl46J1HMXnuT7poGi6vhJWs1YPUwwHyRO8SUHcjTOZkeyoMCddvzb", - "HcjUEUjkpjXepoDF83QxgbasdTsZx3Wmosp5Og4kxv/7Gf1+Rv8tzuiUWImlio5tmlLzvLzyTKXb77E6", - "5sQVWGpzYDE1NbLK16iCmSQLpgL8YZeGwmR389ATS70CEvx3o2S1W0PiaYEMlCRgl3/q0RVC9T2wE3qQ", - "mccQwO9iQMP+wESinbQvLz7m/+MO/iP15l+fr8FGPiS4h7hYzUtxyzXY6QaJkBGuyk9E/RQwyjtv1C9i", - "WEXpo+ZZmLixQxVjxQXTzfZFz+JAAZIXteaVE53MCUnB/J2LhsvXlrDieYyCd35cyY9TZC1STJLbva5i", - "8jfntTR7rMF0iSJiy3kuripr1bL1i6ToVZ6YyYOIKfZDLnCRfn+ApngtDgpQASzLOCOC850xVjNGhKt3", - "hf1dYf9PVtjnZNNqece71F+sYETKAgQ66yD9rhRfoTd0yExzyOI26gmq6StYC68I9i7PNzz8JUw6VUGL", - "ORCN8X/kqkCtdoGkUx//rx3/00XPsoKLAk69ESp0vRAFzLyEsNjNvG/a78XNf43TNppno9iU4i+YfrG/", - "NmozzadXhVX+6qMy2sH3MJX5A/Nv42aK9lBVRGQ61yvmSHOlnSwQkTyv5g6O/UTDXx3fMTeXjVESbUCq", - "osbfTLGAnhe/mxnV/waudXUT4EaVMeTeqVmXbpqC3ezWzFFvW/K0SUG9B7Uo3SzRTudc/Mrzd7oGm7iI", - "IzUMMt7l1L9Gsdcc8PdT62FMQJIP40TZiJqmbLY65geS+ImNiKE1ZNO3OroToPRXO6Ouf8OOTPMfUr0r", - "f7EivXAr1QeQ/O2di9+5eBMuRvMUJDk3TjhafEJemiY/SPczSWvzCzWgKFkgbXU5hLHT/46ekKXLkajX", - "RdUKybphi+2/dBWyX2T82cvY/cUm4IJ6a5bN0i1BBInOSYxsQndaIO0vNQt5BNS7Ufg3NQrbcbFDQ0TI", - "Td2jUJJQiVKlEjVAcb2hOe3kHGICfjdFyzAlH0H8um86zRQGOK/eaRrgni6BBQNc0K+IqztMxHLGn8QK", - "o7IlSbctYB+T/rIJuIB99IPTOPp1f+BSH6oymnqaVeN8+fb/AwAA///ITjuzI/UAAA==", + "raHVRgEaqeEWVRWMGj/r0J3ngNHXybL7bVXdw5QMU41NwqF+7yCRyJIsBSkoaJmJZqI97EugrA9Jwn2c", + "DHCvFivlqj1qylmtiMYL6XmwH1WOYQNH1zLSwCcgj4q9QI9T81qEEZs8XtGMKr0I0+mqnsm3FafElpcS", + "JLHdK1E1c8Sl8JadpdQUDAmyS5CM7Wi8TZT83yAMOuq2IhCaiEBDtSRomYgARI1SRksxTygTgxz0EcMO", + "zAeUenkiAmk0ZrKZ0rLPG1k5yWcPFkehRK2y0TGmjra722ZKzb5rFw6gpDOyXkrJ/C0hmaxxx9l4aB80", + "y7Ppyiv7tCubdZkrLrVyjreQoc26LHj2clU3S9bBqi5zcb6rOiy6zP32xS55IkNev1k8n8utiihhDviA", + "hp4LGFJBdV31fsxlTxkU85ukU+NViL5QubiWvc8DNa6PIDHxu9DzgKUh0JTHOwQypAWfNtTn5oVxWyMl", + "R5iqSCZ90SUB7hAWeki/JsNQjzKUBWMEBnAUl+1S1AxUqrBcXRcBOIZR0VwsAObkg+iQgHKOuzp03Mev", + "KnzUh8IZ6Bs3sx9A0L5yL0ihHPPOogvhRMr/enEDSXTFaaNrs9SaPWbLxmzAUGv2sD+VujZvrNl+wbX8", + "Blwb9fiydmpxsl+cW7xOFQ1TqkCX0Vj04rOJTonI5ssMgW2YC8xCQhYl/KYqJ8zR7cYL+sEiF/YgnZkh", + "vyw8uhYnLud5Jc4YjvKTk0m+1MF5I2J0wTaJwNAL8qbMiXlAzY5C4xHbpFhR/EKfxfhUH0vrvEM7ZxWs", + "5QK8YEenB+z8EX86P78bh8fwpnHi35zR1ttNr/x1v+zu196Ke7evha3XZUk/yRwxxEp2t5exReaUmVYU", + "taobAC4gU5HeYgB+2/otC36r/aZSKH4rd3+LH1XrIiC3R6UAdAgkABGHTQKh3Dx6pDy4lFJ5jBNvsXUR", + "EOYVaFVee1p6vUPifmlzYbEVtW6UYjI6a46vTHLVs06uWt/blk5Ss1DE5mlh9lBOPUPysZ3f7VH4fUQQ", + "U6jFPUB9LARyPy5MunkvOD0TwBgJKvvzezO0Nks1NrJLEMBU07DUZf+uKuzWkRTPqkSbkGDB0ylx4Ajv", + "za9fVZ5XL1pgMWlLmtQ8sIcg07K0q/51GLHjycOtNCpVS2ns6nbxuAMhgsy3b8rL0KO2TFddqVFQczel", + "KqbqMHldSYbnM6mQb80VmUYAnQECZZXlrgzq+A5zPB7nofqsLg5NX144azUPLtoHuXK+mB8I39NGnVDo", + "uGzvqelNTRMGVElSAAOciEHdzZSjBzjlh91MJV/MlzL6UQKFpoLjUYJ44U/sflOnia1o7pEhfK1TqPK5", + "wCgCkk5VsgwS0ZPv2iWuEt5UcRxjHOh3zxJ3aZQpRpnW+lF17yQjKRUEubq4TPyoTMvVoDQlxO1IvQkg", + "gz4SyhSfI8/WflyxKwJeUNBXZXsxUbJZDKLQ3V2dGTXlEu0U0XIufUqVyhVUrW1t51B9p5srld1KDlZr", + "W7lqeWurVqtWi8VicXV+kDS3mLmPUJtRLhYT+Y+mBIVnYswKL+ZNnilAS9XlBJYUOacxk8SJJJHqT5za", + "VNaZn7RFtFFmKANgV09d+vVTN0L13sYQqetarAHRs1d+/ex3ZHrjKikwQEzSBohpW0NS/SsgGRI6JjNb", + "UPsrdv+OoNdAZ9mpak2AOupZZDeTFOGKiyPh/Y8vkkfibBd1tieFkBJeMT2pcQrRH+rZAm5LzNX1OiEg", + "aBx1zYKAyqXjKB2Qm9rg6sZnhBiMhLuS98YFgqAzmD74lXCI8HnBdUW5MLLaCBnExR51Jz+P4/Xo0e31", + "t/SRL4XZtzl5U/rZs7dc29abj6pAnVLPkfsvEzosws+75HmXPGtLHiM0bJKGF1YqTtGrFFEP5VqcRFUG", + "Y/0pawSLSvZUTgJpJMCR/EIZ6KkoBLtOpAc+089y/TqlIjGNBc+zy3znsXce2/B0nyehFKf9HDNlA8sk", + "wuQKkyRZWHI9oyQe+P+YWZLClIWO0nh5N03ehdff1DSxagpSfmmXS9I+sVgKssnUXFhDniSE1b+RFPkF", + "Vk4CM2rgv9rOScwfB5NaSEqV7Ebj6dsiXVXZWr/tsMD6EehVFPTrgCl4ZlG7tvSq/qwJbLz5LaUfS7Sk", + "XtVawgAuHROp5y48yfdNA0XV8UO5mrF6mGA+SJziSw7kaJzNjmRBgTvt+Lc7kKkjkMhNK89NAYvn6WIC", + "bbn0djKOq19F9fx0HEiM//cz+v2M/luc0SmxEksVHds0peZ5eeWZ+rvfY3XMiSuw1ObAYmpqZJWvUQUz", + "SRZMpR3ALg2FyTnnoSeWegUk+O9GyWq3hsTTAhkoScAu/9RTMITqe2An9CAzTzSA38WAhv2BiUQ7aV9e", + "fMz/xx38R+olwj5fg418SHAPcbGal+KWa7DTDRIhI1wVxYj6KWCUd96oX8SwitJHzWM1cWOHKsaKy7ib", + "7Yse64ECJC9qzdsrOsUUkoL5OxcNl68tYcXzGAXv/LiSH6fIWqSYJLd7XcXkb85rafZYg+kSpc2W81xc", + "69aqZet3UtGrPDGTBxFT7Idc4CL9KgJN8VocFKACWJZxRgTnO2OsZowIV+8K+7vC/p+ssM/JptXyjnep", + "v1jBiJQFCHTWQfq1K75Cb+iQmeaQxW3Uw1jTt7kWXhHsXZ5vePhLmHSqghZzIBrj/8hVgVrtAkmnPv5f", + "O/6ni55lBRcFnHojVOh6IQqYeZ9hsZt537Tfi5v/GqdtNM9GsSnFXzD9Yn9t1Gaa5a/KvfzVR2W0g+9h", + "KvMH5t/GzRTtoarTyHSuV8yR5ko7WbYieV7NHRz7iYa/Or5jbi4boyTagFSdj7+ZYgE9L37NM6pKDlzr", + "6ibAjep1yL1Tsy7dNAW72a2Zo9625GmTgnqlalG6WaKdzrn4lefvdA02cRFHahhkvMupf41irzng76fW", + "w5iAJB/GibIRNU3ZbHXMDyTxwx8RQ2vIpi+IdCdA6a92Rl3/hh2Z5j+kelf+YkV64VaqDyD52zsXv3Px", + "JlyM5ilIcm6ccLT4hLw0TX6Q7meS1uYXakBRskDa6nIIY6f/HT0hS5cjUa9LvRWS1cwW23/p2mi/yPiz", + "F9f7i03ABVXgLJulW4IIEp2TGNmE7rRs219qFvIIqHej8G9qFLbjEoyGiJCbukehJKESpQo4aoDiekNz", + "2sk5xAT8bkqpYUo+gvjN4XSaKQxwXr0eNcA9XZgLBrig3zZXd5iI5Yw/iRVGZUuSblvAPib9ZRNwAfvo", + "B6dRuCUCuNSHqrinnmbVOF++/f8AAAD//4vNPSi59QAA", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/internal/cloudapi/v2/openapi.v2.yml b/internal/cloudapi/v2/openapi.v2.yml index 5dffd1f5d..7d776a68c 100644 --- a/internal/cloudapi/v2/openapi.v2.yml +++ b/internal/cloudapi/v2/openapi.v2.yml @@ -2222,6 +2222,11 @@ components: example: true description: | Optional flag to use rhc to register the system, which also always enables Insights. + insights_client_proxy: + type: string + format: uri + description: | + Optional value to set proxy option when registering the system to Insights User: type: object additionalProperties: false