Skip to content

Commit

Permalink
Remove mapstructure annotations (#108)
Browse files Browse the repository at this point in the history 
* Remove mapstructure annotations

* Remove not needed lll linter exception
  • Loading branch information
@arbulu89
arbulu89 authored Sep 21, 2022
1 parent e1f7d2c commit 0b04d39
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 127 deletions.
150 changes: 75 additions & 75 deletions internal/cloud/azure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,123 +23,123 @@ const (
)

type AzureMetadata struct {
Compute Compute `json:"compute,omitempty" mapstructure:"compute,omitempty"`
Network Network `json:"network,omitempty" mapstructure:"network,omitempty"`
Compute Compute `json:"compute,omitempty"`
Network Network `json:"network,omitempty"`
}

type Compute struct {
AzEnvironment string `json:"azEnvironment,omitempty" mapstructure:"azenvironment,omitempty"`
EvictionPolicy string `json:"evictionPolicy,omitempty" mapstructure:"evictionpolicy,omitempty"` //nolint:lll
IsHostCompatibilityLayerVM string `json:"isHostCompatibilityLayerVm,omitempty" mapstructure:"ishostcompatibilitylayervm,omitempty"` //nolint:lll
LicenseType string `json:"licenseType,omitempty" mapstructure:"licensetype,omitempty"`
Location string `json:"location,omitempty" mapstructure:"location,omitempty"`
Name string `json:"name,omitempty" mapstructure:"name,omitempty"`
Offer string `json:"offer,omitempty" mapstructure:"offer,omitempty"`
OsProfile OsProfile `json:"osProfile,omitempty" mapstructure:"osprofile,omitempty"`
OsType string `json:"osType,omitempty" mapstructure:"ostype,omitempty"`
PlacementGroupID string `json:"placementGroupId,omitempty" mapstructure:"placementgroupid,omitempty"` //nolint:lll
Plan Plan `json:"plan,omitempty" mapstructure:"plan,omitempty"`
PlatformFaultDomain string `json:"platformFaultDomain,omitempty" mapstructure:"platformfaultdomain,omitempty"` //nolint:lll
PlatformUpdateDomain string `json:"platformUpdateDomain,omitempty" mapstructure:"platformupdatedomain,omitempty"` //nolint:lll
Priority string `json:"priority,omitempty" mapstructure:"priority,omitempty"`
Provider string `json:"provider,omitempty" mapstructure:"provider,omitempty"`
PublicKeys []*PublicKey `json:"publicKeys,omitempty" mapstructure:"publickeys,omitempty"`
Publisher string `json:"publisher,omitempty" mapstructure:"publisher,omitempty"`
ResourceGroupName string `json:"resourceGroupName,omitempty" mapstructure:"resourcegroupname,omitempty"` //nolint:lll
ResourceID string `json:"resourceId,omitempty" mapstructure:"resourceid,omitempty"`
SecurityProfile SecurityProfile `json:"securityProfile,omitempty" mapstructure:"securityprofile,omitempty"` //nolint:lll
Sku string `json:"sku,omitempty" mapstructure:"sku,omitempty"`
StorageProfile StorageProfile `json:"storageProfile,omitempty" mapstructure:"storageprofile,omitempty"` //nolint:lll
SubscriptionID string `json:"subscriptionId,omitempty" mapstructure:"subscriptionid,omitempty"` //nolint:lll
Tags string `json:"tags,omitempty" mapstructure:"tags,omitempty"`
TagsList []map[string]string `json:"tagsList,omitempty" mapstructure:"tagslist,omitempty"`
UserData string `json:"userData,omitempty" mapstructure:"userdata,omitempty"`
Version string `json:"version,omitempty" mapstructure:"version,omitempty"`
VMID string `json:"vmId,omitempty" mapstructure:"vmid,omitempty"`
VMScaleSetName string `json:"vmScaleSetName,omitempty" mapstructure:"vmscalesetname,omitempty"` //nolint:lll
VMSize string `json:"vmSize,omitempty" mapstructure:"vmsize,omitempty"` //nolint:lll
Zone string `json:"zone,omitempty" mapstructure:"zone,omitempty"`
AzEnvironment string `json:"azEnvironment,omitempty"`
EvictionPolicy string `json:"evictionPolicy,omitempty"`
IsHostCompatibilityLayerVM string `json:"isHostCompatibilityLayerVm,omitempty"`
LicenseType string `json:"licenseType,omitempty"`
Location string `json:"location,omitempty"`
Name string `json:"name,omitempty"`
Offer string `json:"offer,omitempty"`
OsProfile OsProfile `json:"osProfile,omitempty"`
OsType string `json:"osType,omitempty"`
PlacementGroupID string `json:"placementGroupId,omitempty"`
Plan Plan `json:"plan,omitempty"`
PlatformFaultDomain string `json:"platformFaultDomain,omitempty"`
PlatformUpdateDomain string `json:"platformUpdateDomain,omitempty"`
Priority string `json:"priority,omitempty"`
Provider string `json:"provider,omitempty"`
PublicKeys []*PublicKey `json:"publicKeys,omitempty"`
Publisher string `json:"publisher,omitempty"`
ResourceGroupName string `json:"resourceGroupName,omitempty"`
ResourceID string `json:"resourceId,omitempty"`
SecurityProfile SecurityProfile `json:"securityProfile,omitempty"`
Sku string `json:"sku,omitempty"`
StorageProfile StorageProfile `json:"storageProfile,omitempty"`
SubscriptionID string `json:"subscriptionId,omitempty"`
Tags string `json:"tags,omitempty"`
TagsList []map[string]string `json:"tagsList,omitempty"`
UserData string `json:"userData,omitempty"`
Version string `json:"version,omitempty"`
VMID string `json:"vmId,omitempty"`
VMScaleSetName string `json:"vmScaleSetName,omitempty"`
VMSize string `json:"vmSize,omitempty"`
Zone string `json:"zone,omitempty"`
}

type OsProfile struct {
AdminUserName string `json:"adminUsername,omitempty" mapstructure:"adminusername,omitempty"`
ComputerName string `json:"computerName,omitempty" mapstructure:"computername,omitempty"`
DisablePasswordAuthentication string `json:"disablePasswordAuthentication,omitempty" mapstructure:"disablepasswordauthentication,omitempty"` //nolint:lll
AdminUserName string `json:"adminUsername,omitempty"`
ComputerName string `json:"computerName,omitempty"`
DisablePasswordAuthentication string `json:"disablePasswordAuthentication,omitempty"`
}

type Plan struct {
Name string `json:"name,omitempty" mapstructure:"name,omitempty"`
Product string `json:"product,omitempty" mapstructure:"product,omitempty"`
Publisher string `json:"publisher,omitempty" mapstructure:"publisher,omitempty"`
Name string `json:"name,omitempty"`
Product string `json:"product,omitempty"`
Publisher string `json:"publisher,omitempty"`
}

type PublicKey struct {
KeyData string `json:"keyData,omitempty" mapstructure:"keydata,omitempty"`
Path string `json:"path,omitempty" mapstructure:"path,omitempty"`
KeyData string `json:"keyData,omitempty"`
Path string `json:"path,omitempty"`
}

type SecurityProfile struct {
SecureBootEnabled string `json:"secureBootEnabled,omitempty" mapstructure:"securebootenabled,omitempty"`
VirtualTpmEnabled string `json:"virtualTpmEnabled,omitempty" mapstructure:"virtualtpmenabled,omitempty"`
SecureBootEnabled string `json:"secureBootEnabled,omitempty"`
VirtualTpmEnabled string `json:"virtualTpmEnabled,omitempty"`
}

type StorageProfile struct {
DataDisks []*Disk `json:"dataDisks,omitempty" mapstructure:"datadisks,omitempty"`
ImageReference ImageReference `json:"imageReference,omitempty" mapstructure:"imagereference,omitempty"`
OsDisk Disk `json:"osDisk,omitempty" mapstructure:"osDisk,omitempty"`
DataDisks []*Disk `json:"dataDisks,omitempty"`
ImageReference ImageReference `json:"imageReference,omitempty"`
OsDisk Disk `json:"osDisk,omitempty"`
}

type Disk struct {
Caching string `json:"caching,omitempty" mapstructure:"caching,omitempty"`
CreateOption string `json:"createOption,omitempty" mapstructure:"createoption,omitempty"`
DiffDiskSettings map[string]string `json:"diffDiskSettings,omitempty" mapstructure:"diskdiffsettings,omitempty"`
DiskSizeGB string `json:"diskSizeGB,omitempty" mapstructure:"disksizegb,omitempty"`
EncryptionSettings map[string]string `json:"encryptionSettings,omitempty" mapstructure:"encryptionsettings,omitempty"` //nolint:lll
Image map[string]string `json:"image,omitempty" mapstructure:"image,omitempty"`
Lun string `json:"lun,omitempty" mapstructure:"lun,omitempty"`
ManagedDisk ManagedDisk `json:"managedDisk,omitempty" mapstructure:"manageddisk,omitempty"`
Name string `json:"name,omitempty" mapstructure:"name,omitempty"`
OsType string `json:"osType,omitempty" mapstructure:"ostype,omitempty"`
Vhd map[string]string `json:"vhd,omitempty" mapstructure:"vhd,omitempty"`
WriteAcceleratorEnabled string `json:"writeAcceleratorEnabled,omitempty" mapstructure:"writeacceleratorenabled,omitempty"` //nolint:lll
Caching string `json:"caching,omitempty"`
CreateOption string `json:"createOption,omitempty"`
DiffDiskSettings map[string]string `json:"diffDiskSettings,omitempty"`
DiskSizeGB string `json:"diskSizeGB,omitempty"`
EncryptionSettings map[string]string `json:"encryptionSettings,omitempty"`
Image map[string]string `json:"image,omitempty"`
Lun string `json:"lun,omitempty"`
ManagedDisk ManagedDisk `json:"managedDisk,omitempty"`
Name string `json:"name,omitempty"`
OsType string `json:"osType,omitempty"`
Vhd map[string]string `json:"vhd,omitempty"`
WriteAcceleratorEnabled string `json:"writeAcceleratorEnabled,omitempty"`
}

type ManagedDisk struct {
ID string `json:"id,omitempty" mapstructure:"id,omitempty"`
StorageAccountType string `json:"storageAccountType,omitempty" mapstructure:"storageaccounttype,omitempty"`
ID string `json:"id,omitempty"`
StorageAccountType string `json:"storageAccountType,omitempty"`
}

type ImageReference struct {
ID string `json:"id,omitempty" mapstructure:"id,omitempty"`
Offer string `json:"offer,omitempty" mapstructure:"offer,omitempty"`
Publisher string `json:"publisher,omitempty" mapstructure:"publisher,omitempty"`
Sku string `json:"sku,omitempty" mapstructure:"sku,omitempty"`
Version string `json:"version,omitempty" mapstructure:"version,omitempty"`
ID string `json:"id,omitempty"`
Offer string `json:"offer,omitempty"`
Publisher string `json:"publisher,omitempty"`
Sku string `json:"sku,omitempty"`
Version string `json:"version,omitempty"`
}

type Network struct {
Interfaces []*Interface `json:"interface,omitempty" mapstructure:"interfaces,omitempty"`
Interfaces []*Interface `json:"interface,omitempty"`
}

type Interface struct {
Ipv4 IP `json:"ipv4,omitempty" mapstructure:"ipv4,omitempty"`
Ipv6 IP `json:"ipv6,omitempty" mapstructure:"ipv6,omitempty"`
MacAddress string `json:"macAddress,omitempty" mapstructure:"macaddress,omitempty"`
Ipv4 IP `json:"ipv4,omitempty"`
Ipv6 IP `json:"ipv6,omitempty"`
MacAddress string `json:"macAddress,omitempty"`
}

type IP struct {
Addresses []*Address `json:"ipAddress,omitempty" mapstructure:"ipaddress,omitempty"`
Subnets []*Subnet `json:"subnet,omitempty" mapstructure:"subbet,omitempty"`
Addresses []*Address `json:"ipAddress,omitempty"`
Subnets []*Subnet `json:"subnet,omitempty"`
}

type Address struct {
PrivateIP string `json:"privateIpAddress,omitempty" mapstructure:"privateip,omitempty"`
PublicIP string `json:"publicIpAddress,omitempty" mapstructure:"publicip,omitempty"`
PrivateIP string `json:"privateIpAddress,omitempty"`
PublicIP string `json:"publicIpAddress,omitempty"`
}

type Subnet struct {
Address string `json:"address,omitempty" mapstructure:"address,omitempty"`
Prefix string `json:"prefix,omitempty" mapstructure:"prefix,omitempty"`
Address string `json:"address,omitempty"`
Prefix string `json:"prefix,omitempty"`
}

func NewAzureMetadata() (*AzureMetadata, error) {
Expand Down
4 changes: 2 additions & 2 deletions internal/cloud/metadata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const (
)

type Instance struct {
Provider string `mapstructure:"provider,omitempty"`
Metadata interface{} `mapstructure:"metadata,omitempty"`
Provider string
Metadata interface{}
}

type Identifier struct {
Expand Down
14 changes: 7 additions & 7 deletions internal/cluster/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ type DiscoveryTools struct {
}

type Cluster struct {
Cib cib.Root `mapstructure:"cib,omitempty"`
Crmmon crmmon.Root `mapstructure:"crmmon,omitempty"`
SBD SBD `mapstructure:"sbd,omitempty"`
ID string `mapstructure:"id" json:"Id"`
Name string `mapstructure:"name"`
DC bool `mapstructure:"dc"`
Provider string `mapstructure:"provider"`
Cib cib.Root
Crmmon crmmon.Root
SBD SBD
ID string `json:"Id"`
Name string
DC bool
Provider string
}

func Md5sumFile(filePath string) (string, error) {
Expand Down
34 changes: 17 additions & 17 deletions internal/cluster/sbd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,34 @@ const (

type SBD struct {
cluster string
Devices []*SBDDevice `mapstructure:"devices,omitempty"`
Config map[string]interface{} `mapstructure:"config,omitempty"`
Devices []*SBDDevice
Config map[string]interface{}
}

type SBDDevice struct {
executor utils.CommandExecutor
sbdPath string
Device string `mapstructure:"device,omitempty"`
Status string `mapstructure:"status,omitempty"`
Dump SBDDump `mapstructure:"dump,omitempty"`
List []*SBDNode `mapstructure:"list,omitempty"`
Device string
Status string
Dump SBDDump
List []*SBDNode
}

type SBDDump struct {
Header string `mapstructure:"header,omitempty"`
UUID string `mapstructure:"uuid,omitempty" json:"Uuid"`
Slots int `mapstructure:"slots,omitempty"`
SectorSize int `mapstructure:"sectorsize,omitempty"`
TimeoutWatchdog int `mapstructure:"timeoutwatchdog,omitempty"`
TimeoutAllocate int `mapstructure:"timeoutallocate,omitempty"`
TimeoutLoop int `mapstructure:"timeoutloop,omitempty"`
TimeoutMsgwait int `mapstructure:"timeoutmsgwait,omitempty"`
Header string
UUID string `json:"Uuid"`
Slots int
SectorSize int
TimeoutWatchdog int
TimeoutAllocate int
TimeoutLoop int
TimeoutMsgwait int
}

type SBDNode struct {
ID int `mapstructure:"id,omitempty" json:"Id"`
Name string `mapstructure:"name,omitempty"`
Status string `mapstructure:"status,omitempty"`
ID int `json:"Id"`
Name string
Status string
}

func NewSBD(executor utils.CommandExecutor, cluster, sbdPath, sbdConfigPath string) (SBD, error) {
Expand Down
34 changes: 17 additions & 17 deletions internal/sapsystem/sapcontrolapi/webservice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,29 +66,29 @@ type GetSystemInstanceListResponse struct {
}

type OSProcess struct {
Name string `xml:"name,omitempty" json:"name,omitempty" mapstructure:"name,omitempty"`
Description string `xml:"description,omitempty" json:"description,omitempty" mapstructure:"description,omitempty"`
Dispstatus STATECOLOR `xml:"dispstatus,omitempty" json:"dispstatus,omitempty" mapstructure:"dispstatus,omitempty"`
Textstatus string `xml:"textstatus,omitempty" json:"textstatus,omitempty" mapstructure:"textstatus,omitempty"`
Starttime string `xml:"starttime,omitempty" json:"starttime,omitempty" mapstructure:"starttime,omitempty"`
Elapsedtime string `xml:"elapsedtime,omitempty" json:"elapsedtime,omitempty" mapstructure:"elapsedtime,omitempty"`
Pid int32 `xml:"pid,omitempty" json:"pid,omitempty" mapstructure:"pid,omitempty"`
Name string `xml:"name,omitempty" json:"name,omitempty"`
Description string `xml:"description,omitempty" json:"description,omitempty"`
Dispstatus STATECOLOR `xml:"dispstatus,omitempty" json:"dispstatus,omitempty"`
Textstatus string `xml:"textstatus,omitempty" json:"textstatus,omitempty"`
Starttime string `xml:"starttime,omitempty" json:"starttime,omitempty"`
Elapsedtime string `xml:"elapsedtime,omitempty" json:"elapsedtime,omitempty"`
Pid int32 `xml:"pid,omitempty" json:"pid,omitempty"`
}

type InstanceProperty struct {
Property string `xml:"property,omitempty" json:"property,omitempty" mapstructure:"property,omitempty"`
Propertytype string `xml:"propertytype,omitempty" json:"propertytype,omitempty" mapstructure:"propertytype,omitempty"`
Value string `xml:"value,omitempty" json:"value,omitempty" mapstructure:"value,omitempty"`
Property string `xml:"property,omitempty" json:"property,omitempty"`
Propertytype string `xml:"propertytype,omitempty" json:"propertytype,omitempty"`
Value string `xml:"value,omitempty" json:"value,omitempty"`
}

type SAPInstance struct {
Hostname string `xml:"hostname,omitempty" json:"hostname,omitempty" mapstructure:"hostname,omitempty"`
InstanceNr int32 `xml:"instanceNr,omitempty" json:"instanceNr" mapstructure:"instancenr"`
HttpPort int32 `xml:"httpPort,omitempty" json:"httpPort,omitempty" mapstructure:"httpport,omitempty"`
HttpsPort int32 `xml:"httpsPort,omitempty" json:"httpsPort,omitempty" mapstructure:"httpsport,omitempty"`
StartPriority string `xml:"startPriority,omitempty" json:"startPriority,omitempty" mapstructure:"startpriority,omitempty"`
Features string `xml:"features,omitempty" json:"features,omitempty" mapstructure:"features,omitempty"`
Dispstatus STATECOLOR `xml:"dispstatus,omitempty" json:"dispstatus,omitempty" mapstructure:"dispstatus,omitempty"`
Hostname string `xml:"hostname,omitempty" json:"hostname,omitempty"`
InstanceNr int32 `xml:"instanceNr,omitempty" json:"instanceNr"`
HttpPort int32 `xml:"httpPort,omitempty" json:"httpPort,omitempty"`
HttpsPort int32 `xml:"httpsPort,omitempty" json:"httpsPort,omitempty"`
StartPriority string `xml:"startPriority,omitempty" json:"startPriority,omitempty"`
Features string `xml:"features,omitempty" json:"features,omitempty"`
Dispstatus STATECOLOR `xml:"dispstatus,omitempty" json:"dispstatus,omitempty"`
}

type webService struct {
Expand Down
Loading

0 comments on commit 0b04d39

Please sign in to comment.