From f2f032461ed674c68ec33eae007faf1af69583f1 Mon Sep 17 00:00:00 2001 From: Nick Metz Date: Mon, 9 Aug 2021 11:58:22 +0200 Subject: [PATCH] update go sdk version --- .openapi-generator/FILES | 3 - README.md | 2 - api/openapi.yaml | 142 +++++++++++++++++++-------------------- docs/Monitor.md | 78 ++++++++++----------- go.mod | 4 +- go.sum | 19 ++---- model_monitor.go | 110 +++++++++++++++--------------- 7 files changed, 173 insertions(+), 185 deletions(-) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index a464ff3..e794754 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -92,7 +92,6 @@ docs/IntegrationApi.md docs/IntegrationServiceMap.md docs/IntegrationTypeEnum.md docs/IpVersion.md -docs/Ipv6Address.md docs/JwtAlgorithm.md docs/LastErrorLevel.md docs/LinksData.md @@ -201,8 +200,6 @@ docs/VaultSectionAuthorizationType.md docs/WaterfallInfo.md docs/WaterfallResponse.md git_push.sh -go.mod -go.sum model_account_statistics.go model_alert.go model_alert_attributes.go diff --git a/README.md b/README.md index dc57e76..bf6b30c 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ Please note that this is not a sandbox environment: these API methods operate di For more information, please visit https://www.uptrends.com/api. -`openapi-generator-cli generate -i https://api.uptrends.com/v4/swagger/v1/swagger.json -g go -o . --package-name=uptrends -p enumClassPrefix=true` - ## Overview This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client. diff --git a/api/openapi.yaml b/api/openapi.yaml index fa59104..a990c74 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -12986,8 +12986,12 @@ components: Hash: description: Hash corresponding with this monitor. type: string - SelfServiceTransactionScript: - type: string + TransactionStepDefinition: + allOf: + - $ref: '#/components/schemas/TransactionStepDefinition' + description: 'Only valid for Transaction monitors: the data structure that + specifies the transaction steps (and sub steps) to execute.' + type: object BlockUptrendsRum: type: boolean BlockGoogleAnalytics: @@ -13039,18 +13043,14 @@ components: items: $ref: '#/components/schemas/CustomMetric' type: array + SelfServiceTransactionScript: + type: string Password: type: string NameForPhoneAlerts: type: string ThrottlingOptions: $ref: '#/components/schemas/ThrottlingOptions' - TransactionStepDefinition: - allOf: - - $ref: '#/components/schemas/TransactionStepDefinition' - description: 'Only valid for Transaction monitors: the data structure that - specifies the transaction steps (and sub steps) to execute.' - type: object CertificateName: type: string CertificateOrganization: @@ -13239,6 +13239,69 @@ components: - Development - Staging - Production + TransactionStepDefinition: + properties: + Steps: + items: + $ref: '#/components/schemas/TransactionStep2' + type: array + type: object + TransactionStep2: + properties: + Name: + type: string + HasScreenshot: + type: boolean + HasWaterfall: + type: boolean + SubSteps: + items: + $ref: '#/components/schemas/TransactionSubStep' + type: array + required: + - HasScreenshot + - HasWaterfall + type: object + TransactionSubStep: + properties: + Name: + type: string + Type: + $ref: '#/components/schemas/SubStepType' + Url: + type: string + SetValue: + type: string + required: + - Type + type: object + SubStepType: + description: "" + enum: + - Navigate + - Click + - Set + - Test + - Script + - Hover + - Screenshot + - ScrollTo + - WaitForElement + - SwitchToFrame + - SwitchToTab + type: string + x-enumNames: + - Navigate + - Click + - Set + - Test + - Script + - Hover + - Screenshot + - ScrollTo + - WaitForElement + - SwitchToFrame + - SwitchToTab RequestHeader: example: Value: Value @@ -13755,69 +13818,6 @@ components: - _2G - _3G - _4G - TransactionStepDefinition: - properties: - Steps: - items: - $ref: '#/components/schemas/TransactionStep2' - type: array - type: object - TransactionStep2: - properties: - Name: - type: string - HasScreenshot: - type: boolean - HasWaterfall: - type: boolean - SubSteps: - items: - $ref: '#/components/schemas/TransactionSubStep' - type: array - required: - - HasScreenshot - - HasWaterfall - type: object - TransactionSubStep: - properties: - Name: - type: string - Type: - $ref: '#/components/schemas/SubStepType' - Url: - type: string - SetValue: - type: string - required: - - Type - type: object - SubStepType: - description: "" - enum: - - Navigate - - Click - - Set - - Test - - Script - - Hover - - Screenshot - - ScrollTo - - WaitForElement - - SwitchToFrame - - SwitchToTab - type: string - x-enumNames: - - Navigate - - Click - - Set - - Test - - Script - - Hover - - Screenshot - - ScrollTo - - WaitForElement - - SwitchToFrame - - SwitchToTab DnsQuery: description: "" enum: diff --git a/docs/Monitor.md b/docs/Monitor.md index fb0e787..61ac3ee 100644 --- a/docs/Monitor.md +++ b/docs/Monitor.md @@ -17,7 +17,7 @@ Name | Type | Description | Notes **MonitorMode** | Pointer to [**MonitorMode**](MonitorMode.md) | | [optional] **Notes** | Pointer to **string** | | [optional] **Hash** | Pointer to **string** | Hash corresponding with this monitor. | [optional] -**SelfServiceTransactionScript** | Pointer to **string** | | [optional] +**TransactionStepDefinition** | Pointer to [**TransactionStepDefinition**](TransactionStepDefinition.md) | Only valid for Transaction monitors: the data structure that specifies the transaction steps (and sub steps) to execute. | [optional] **BlockUptrendsRum** | Pointer to **bool** | | [optional] **BlockGoogleAnalytics** | Pointer to **bool** | | [optional] **BlockUrls** | Pointer to **[]string** | | [optional] @@ -36,10 +36,10 @@ Name | Type | Description | Notes **MsaSteps** | Pointer to [**[]MsaStep**](MsaStep.md) | | [optional] **UserDefinedFunctions** | Pointer to [**[]UserDefinedFunction**](UserDefinedFunction.md) | | [optional] **CustomMetrics** | Pointer to [**[]CustomMetric**](CustomMetric.md) | | [optional] +**SelfServiceTransactionScript** | Pointer to **string** | | [optional] **Password** | Pointer to **string** | | [optional] **NameForPhoneAlerts** | Pointer to **string** | | [optional] **ThrottlingOptions** | Pointer to [**ThrottlingOptions**](ThrottlingOptions.md) | | [optional] -**TransactionStepDefinition** | Pointer to [**TransactionStepDefinition**](TransactionStepDefinition.md) | Only valid for Transaction monitors: the data structure that specifies the transaction steps (and sub steps) to execute. | [optional] **CertificateName** | Pointer to **string** | | [optional] **CertificateOrganization** | Pointer to **string** | | [optional] **CertificateOrganizationalUnit** | Pointer to **string** | | [optional] @@ -428,30 +428,30 @@ SetHash sets Hash field to given value. HasHash returns a boolean if a field has been set. -### GetSelfServiceTransactionScript +### GetTransactionStepDefinition -`func (o *Monitor) GetSelfServiceTransactionScript() string` +`func (o *Monitor) GetTransactionStepDefinition() TransactionStepDefinition` -GetSelfServiceTransactionScript returns the SelfServiceTransactionScript field if non-nil, zero value otherwise. +GetTransactionStepDefinition returns the TransactionStepDefinition field if non-nil, zero value otherwise. -### GetSelfServiceTransactionScriptOk +### GetTransactionStepDefinitionOk -`func (o *Monitor) GetSelfServiceTransactionScriptOk() (*string, bool)` +`func (o *Monitor) GetTransactionStepDefinitionOk() (*TransactionStepDefinition, bool)` -GetSelfServiceTransactionScriptOk returns a tuple with the SelfServiceTransactionScript field if it's non-nil, zero value otherwise +GetTransactionStepDefinitionOk returns a tuple with the TransactionStepDefinition field if it's non-nil, zero value otherwise and a boolean to check if the value has been set. -### SetSelfServiceTransactionScript +### SetTransactionStepDefinition -`func (o *Monitor) SetSelfServiceTransactionScript(v string)` +`func (o *Monitor) SetTransactionStepDefinition(v TransactionStepDefinition)` -SetSelfServiceTransactionScript sets SelfServiceTransactionScript field to given value. +SetTransactionStepDefinition sets TransactionStepDefinition field to given value. -### HasSelfServiceTransactionScript +### HasTransactionStepDefinition -`func (o *Monitor) HasSelfServiceTransactionScript() bool` +`func (o *Monitor) HasTransactionStepDefinition() bool` -HasSelfServiceTransactionScript returns a boolean if a field has been set. +HasTransactionStepDefinition returns a boolean if a field has been set. ### GetBlockUptrendsRum @@ -903,6 +903,31 @@ SetCustomMetrics sets CustomMetrics field to given value. HasCustomMetrics returns a boolean if a field has been set. +### GetSelfServiceTransactionScript + +`func (o *Monitor) GetSelfServiceTransactionScript() string` + +GetSelfServiceTransactionScript returns the SelfServiceTransactionScript field if non-nil, zero value otherwise. + +### GetSelfServiceTransactionScriptOk + +`func (o *Monitor) GetSelfServiceTransactionScriptOk() (*string, bool)` + +GetSelfServiceTransactionScriptOk returns a tuple with the SelfServiceTransactionScript field if it's non-nil, zero value otherwise +and a boolean to check if the value has been set. + +### SetSelfServiceTransactionScript + +`func (o *Monitor) SetSelfServiceTransactionScript(v string)` + +SetSelfServiceTransactionScript sets SelfServiceTransactionScript field to given value. + +### HasSelfServiceTransactionScript + +`func (o *Monitor) HasSelfServiceTransactionScript() bool` + +HasSelfServiceTransactionScript returns a boolean if a field has been set. + ### GetPassword `func (o *Monitor) GetPassword() string` @@ -978,31 +1003,6 @@ SetThrottlingOptions sets ThrottlingOptions field to given value. HasThrottlingOptions returns a boolean if a field has been set. -### GetTransactionStepDefinition - -`func (o *Monitor) GetTransactionStepDefinition() TransactionStepDefinition` - -GetTransactionStepDefinition returns the TransactionStepDefinition field if non-nil, zero value otherwise. - -### GetTransactionStepDefinitionOk - -`func (o *Monitor) GetTransactionStepDefinitionOk() (*TransactionStepDefinition, bool)` - -GetTransactionStepDefinitionOk returns a tuple with the TransactionStepDefinition field if it's non-nil, zero value otherwise -and a boolean to check if the value has been set. - -### SetTransactionStepDefinition - -`func (o *Monitor) SetTransactionStepDefinition(v TransactionStepDefinition)` - -SetTransactionStepDefinition sets TransactionStepDefinition field to given value. - -### HasTransactionStepDefinition - -`func (o *Monitor) HasTransactionStepDefinition() bool` - -HasTransactionStepDefinition returns a boolean if a field has been set. - ### GetCertificateName `func (o *Monitor) GetCertificateName() string` diff --git a/go.mod b/go.mod index 2bae9c2..0682c97 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.16 require ( github.com/golang/protobuf v1.5.2 // indirect - golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect - golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 + golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect + golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.27.1 // indirect ) diff --git a/go.sum b/go.sum index e977b0f..aefd12b 100644 --- a/go.sum +++ b/go.sum @@ -58,7 +58,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -71,7 +70,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= @@ -85,6 +83,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -157,7 +156,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e h1:bRhVy7zSSasaqNksaRZiA5EEI+Ei4I1nO5Jh72wfHlg= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -181,21 +179,18 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8= -golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 h1:3B43BWw0xEBsLZ/NO1VALz6fppU3481pik+2Ksv45z8= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a h1:4Kd8OPUx1xgUwrHDaviWZO8MsgoZTZYC3g+8m16RBww= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -282,6 +277,7 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -300,12 +296,10 @@ google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= @@ -359,7 +353,6 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= diff --git a/model_monitor.go b/model_monitor.go index 3c58a79..17bd41d 100644 --- a/model_monitor.go +++ b/model_monitor.go @@ -36,7 +36,8 @@ type Monitor struct { Notes *string `json:"Notes,omitempty"` // Hash corresponding with this monitor. Hash *string `json:"Hash,omitempty"` - SelfServiceTransactionScript *string `json:"SelfServiceTransactionScript,omitempty"` + // Only valid for Transaction monitors: the data structure that specifies the transaction steps (and sub steps) to execute. + TransactionStepDefinition *TransactionStepDefinition `json:"TransactionStepDefinition,omitempty"` BlockUptrendsRum *bool `json:"BlockUptrendsRum,omitempty"` BlockGoogleAnalytics *bool `json:"BlockGoogleAnalytics,omitempty"` BlockUrls *[]string `json:"BlockUrls,omitempty"` @@ -55,11 +56,10 @@ type Monitor struct { MsaSteps *[]MsaStep `json:"MsaSteps,omitempty"` UserDefinedFunctions *[]UserDefinedFunction `json:"UserDefinedFunctions,omitempty"` CustomMetrics *[]CustomMetric `json:"CustomMetrics,omitempty"` + SelfServiceTransactionScript *string `json:"SelfServiceTransactionScript,omitempty"` Password *string `json:"Password,omitempty"` NameForPhoneAlerts *string `json:"NameForPhoneAlerts,omitempty"` ThrottlingOptions *ThrottlingOptions `json:"ThrottlingOptions,omitempty"` - // Only valid for Transaction monitors: the data structure that specifies the transaction steps (and sub steps) to execute. - TransactionStepDefinition *TransactionStepDefinition `json:"TransactionStepDefinition,omitempty"` CertificateName *string `json:"CertificateName,omitempty"` CertificateOrganization *string `json:"CertificateOrganization,omitempty"` CertificateOrganizationalUnit *string `json:"CertificateOrganizationalUnit,omitempty"` @@ -546,36 +546,36 @@ func (o *Monitor) SetHash(v string) { o.Hash = &v } -// GetSelfServiceTransactionScript returns the SelfServiceTransactionScript field value if set, zero value otherwise. -func (o *Monitor) GetSelfServiceTransactionScript() string { - if o == nil || o.SelfServiceTransactionScript == nil { - var ret string +// GetTransactionStepDefinition returns the TransactionStepDefinition field value if set, zero value otherwise. +func (o *Monitor) GetTransactionStepDefinition() TransactionStepDefinition { + if o == nil || o.TransactionStepDefinition == nil { + var ret TransactionStepDefinition return ret } - return *o.SelfServiceTransactionScript + return *o.TransactionStepDefinition } -// GetSelfServiceTransactionScriptOk returns a tuple with the SelfServiceTransactionScript field value if set, nil otherwise +// GetTransactionStepDefinitionOk returns a tuple with the TransactionStepDefinition field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *Monitor) GetSelfServiceTransactionScriptOk() (*string, bool) { - if o == nil || o.SelfServiceTransactionScript == nil { +func (o *Monitor) GetTransactionStepDefinitionOk() (*TransactionStepDefinition, bool) { + if o == nil || o.TransactionStepDefinition == nil { return nil, false } - return o.SelfServiceTransactionScript, true + return o.TransactionStepDefinition, true } -// HasSelfServiceTransactionScript returns a boolean if a field has been set. -func (o *Monitor) HasSelfServiceTransactionScript() bool { - if o != nil && o.SelfServiceTransactionScript != nil { +// HasTransactionStepDefinition returns a boolean if a field has been set. +func (o *Monitor) HasTransactionStepDefinition() bool { + if o != nil && o.TransactionStepDefinition != nil { return true } return false } -// SetSelfServiceTransactionScript gets a reference to the given string and assigns it to the SelfServiceTransactionScript field. -func (o *Monitor) SetSelfServiceTransactionScript(v string) { - o.SelfServiceTransactionScript = &v +// SetTransactionStepDefinition gets a reference to the given TransactionStepDefinition and assigns it to the TransactionStepDefinition field. +func (o *Monitor) SetTransactionStepDefinition(v TransactionStepDefinition) { + o.TransactionStepDefinition = &v } // GetBlockUptrendsRum returns the BlockUptrendsRum field value if set, zero value otherwise. @@ -1154,6 +1154,38 @@ func (o *Monitor) SetCustomMetrics(v []CustomMetric) { o.CustomMetrics = &v } +// GetSelfServiceTransactionScript returns the SelfServiceTransactionScript field value if set, zero value otherwise. +func (o *Monitor) GetSelfServiceTransactionScript() string { + if o == nil || o.SelfServiceTransactionScript == nil { + var ret string + return ret + } + return *o.SelfServiceTransactionScript +} + +// GetSelfServiceTransactionScriptOk returns a tuple with the SelfServiceTransactionScript field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *Monitor) GetSelfServiceTransactionScriptOk() (*string, bool) { + if o == nil || o.SelfServiceTransactionScript == nil { + return nil, false + } + return o.SelfServiceTransactionScript, true +} + +// HasSelfServiceTransactionScript returns a boolean if a field has been set. +func (o *Monitor) HasSelfServiceTransactionScript() bool { + if o != nil && o.SelfServiceTransactionScript != nil { + return true + } + + return false +} + +// SetSelfServiceTransactionScript gets a reference to the given string and assigns it to the SelfServiceTransactionScript field. +func (o *Monitor) SetSelfServiceTransactionScript(v string) { + o.SelfServiceTransactionScript = &v +} + // GetPassword returns the Password field value if set, zero value otherwise. func (o *Monitor) GetPassword() string { if o == nil || o.Password == nil { @@ -1250,38 +1282,6 @@ func (o *Monitor) SetThrottlingOptions(v ThrottlingOptions) { o.ThrottlingOptions = &v } -// GetTransactionStepDefinition returns the TransactionStepDefinition field value if set, zero value otherwise. -func (o *Monitor) GetTransactionStepDefinition() TransactionStepDefinition { - if o == nil || o.TransactionStepDefinition == nil { - var ret TransactionStepDefinition - return ret - } - return *o.TransactionStepDefinition -} - -// GetTransactionStepDefinitionOk returns a tuple with the TransactionStepDefinition field value if set, nil otherwise -// and a boolean to check if the value has been set. -func (o *Monitor) GetTransactionStepDefinitionOk() (*TransactionStepDefinition, bool) { - if o == nil || o.TransactionStepDefinition == nil { - return nil, false - } - return o.TransactionStepDefinition, true -} - -// HasTransactionStepDefinition returns a boolean if a field has been set. -func (o *Monitor) HasTransactionStepDefinition() bool { - if o != nil && o.TransactionStepDefinition != nil { - return true - } - - return false -} - -// SetTransactionStepDefinition gets a reference to the given TransactionStepDefinition and assigns it to the TransactionStepDefinition field. -func (o *Monitor) SetTransactionStepDefinition(v TransactionStepDefinition) { - o.TransactionStepDefinition = &v -} - // GetCertificateName returns the CertificateName field value if set, zero value otherwise. func (o *Monitor) GetCertificateName() string { if o == nil || o.CertificateName == nil { @@ -2699,8 +2699,8 @@ func (o Monitor) MarshalJSON() ([]byte, error) { if o.Hash != nil { toSerialize["Hash"] = o.Hash } - if o.SelfServiceTransactionScript != nil { - toSerialize["SelfServiceTransactionScript"] = o.SelfServiceTransactionScript + if o.TransactionStepDefinition != nil { + toSerialize["TransactionStepDefinition"] = o.TransactionStepDefinition } if o.BlockUptrendsRum != nil { toSerialize["BlockUptrendsRum"] = o.BlockUptrendsRum @@ -2756,6 +2756,9 @@ func (o Monitor) MarshalJSON() ([]byte, error) { if o.CustomMetrics != nil { toSerialize["CustomMetrics"] = o.CustomMetrics } + if o.SelfServiceTransactionScript != nil { + toSerialize["SelfServiceTransactionScript"] = o.SelfServiceTransactionScript + } if o.Password != nil { toSerialize["Password"] = o.Password } @@ -2765,9 +2768,6 @@ func (o Monitor) MarshalJSON() ([]byte, error) { if o.ThrottlingOptions != nil { toSerialize["ThrottlingOptions"] = o.ThrottlingOptions } - if o.TransactionStepDefinition != nil { - toSerialize["TransactionStepDefinition"] = o.TransactionStepDefinition - } if o.CertificateName != nil { toSerialize["CertificateName"] = o.CertificateName }