Skip to content

Commit

Permalink
Sync bitbucket and GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
@carchi8py
carchi8py committed Feb 23, 2024
1 parent e988598 commit e2e6188
Show file tree
Hide file tree
Showing 5 changed files with 283 additions and 42 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## 24.2.0
NEW FEATURES:
* resource/connector_aws: support `instance_metadata` block.

## 24.1.0
NEW ENHANCEMENTS:
ENHANCEMENTS:
* resource/cvo_gcp: fix typo on vpc3_firewall_rule_tag_name.
* add logging to API calls.

Expand Down
60 changes: 53 additions & 7 deletions cloudmanager/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ type Client struct {
}

// CallAWSInstanceCreate can be used to make a request to create AWS Instance
func (c *Client) CallAWSInstanceCreate(occmDetails createOCCMDetails) (string, error) {
func (c *Client) CallAWSInstanceCreate(occmDetails createAWSOCCMDetails) (string, error) {

var sess *session.Session
if c.AWSProfile != "" {
Expand Down Expand Up @@ -160,6 +160,16 @@ func (c *Client) CallAWSInstanceCreate(occmDetails createOCCMDetails) (string, e
// Network interfaces and an instance-level security groups may not be specified on the same request
runInstancesInput.SecurityGroupIds = securityGroupIds
}
runInstancesInput.MetadataOptions = &ec2.InstanceMetadataOptionsRequest{}
if occmDetails.InstanceMetadata.HTTPEndpoint != nil {
runInstancesInput.MetadataOptions.HttpEndpoint = aws.String(*occmDetails.InstanceMetadata.HTTPEndpoint)
}
if occmDetails.InstanceMetadata.HTTPPutResponseHopLimit != nil {
runInstancesInput.MetadataOptions.HttpPutResponseHopLimit = aws.Int64(*occmDetails.InstanceMetadata.HTTPPutResponseHopLimit)
}
if occmDetails.InstanceMetadata.HTTPTokens != nil {
runInstancesInput.MetadataOptions.HttpTokens = aws.String(*occmDetails.InstanceMetadata.HTTPTokens)
}
log.Print("CallAWSInstanceCreate occmDetails name:", occmDetails.Name)
runResult, err := svc.RunInstances(runInstancesInput)

Expand All @@ -173,6 +183,42 @@ func (c *Client) CallAWSInstanceCreate(occmDetails createOCCMDetails) (string, e
return *runResult.Instances[0].InstanceId, nil
}

// CallAWSInstanceUpdate updates the instance metadata
func (c *Client) CallAWSInstanceUpdate(occmDetails createAWSOCCMDetails) error {

var sess *session.Session
if c.AWSProfile != "" {
sess = session.Must(session.NewSession(
&aws.Config{
Region: aws.String(occmDetails.Region),
Credentials: credentials.NewSharedCredentials(c.AWSProfileFilePath, c.AWSProfile),
}))
} else {
sess = session.Must(session.NewSession(aws.NewConfig().WithRegion(occmDetails.Region)))
}

// Create EC2 service client
svc := ec2.New(sess)

modifyInstanceMetadataInput := &ec2.ModifyInstanceMetadataOptionsInput{
InstanceId: aws.String(occmDetails.InstanceID),
HttpTokens: aws.String(*occmDetails.InstanceMetadata.HTTPTokens),
HttpEndpoint: aws.String(*occmDetails.InstanceMetadata.HTTPEndpoint),
HttpPutResponseHopLimit: aws.Int64(*occmDetails.InstanceMetadata.HTTPPutResponseHopLimit),
}

log.Print("CallAWSInstanceUpdate occmDetails name:", occmDetails.Name)
result, err := svc.ModifyInstanceMetadataOptions(modifyInstanceMetadataInput)

if err != nil {
log.Print("Could not update instance ", err)
return err
}

log.Printf("Updated instance %s", *result.InstanceMetadataOptions, *result.InstanceId)
return nil
}

// CallAWSInstanceTerminate can be used to make a request to terminate AWS Instance
func (c *Client) CallAWSInstanceTerminate(occmDetails deleteOCCMDetails) error {

Expand Down Expand Up @@ -524,7 +570,7 @@ func (c *Client) CallDeleteAzureVM(occmDetails deleteOCCMDetails) error {
}

// CallAMIGet can be used to make a request to get AWS AMI
func (c *Client) CallAMIGet(occmDetails createOCCMDetails) (string, error) {
func (c *Client) CallAMIGet(occmDetails createAWSOCCMDetails) (string, error) {

var sess *session.Session
if c.AWSProfile != "" {
Expand Down Expand Up @@ -653,7 +699,7 @@ func (c *Client) CallVNetGetCidr(subscriptionID string, resourceGroup string, vn
}

// CallAWSInstanceGet can be used to make a request to get AWS Instance
func (c *Client) CallAWSInstanceGet(occmDetails createOCCMDetails) ([]ec2.Instance, error) {
func (c *Client) CallAWSInstanceGet(occmDetails createAWSOCCMDetails) ([]ec2.Instance, error) {
if occmDetails.Region == "" {
regions, err := c.CallAWSRegionGet(occmDetails)
if err != nil {
Expand Down Expand Up @@ -733,7 +779,7 @@ func (c *Client) CallAWSInstanceGet(occmDetails createOCCMDetails) ([]ec2.Instan
}

// CallAWSRegionGet describe all regions.
func (c *Client) CallAWSRegionGet(occmDetails createOCCMDetails) ([]string, error) {
func (c *Client) CallAWSRegionGet(occmDetails createAWSOCCMDetails) ([]string, error) {
var sess *session.Session
if c.AWSProfile != "" {
sess = session.Must(session.NewSession(
Expand Down Expand Up @@ -854,7 +900,7 @@ func (c *Client) GetSimulator() bool {
}

// CallAWSTagCreate creates tag
func (c *Client) CallAWSTagCreate(occmDetails createOCCMDetails) error {
func (c *Client) CallAWSTagCreate(occmDetails createAWSOCCMDetails) error {

var sess *session.Session
if c.AWSProfile != "" {
Expand Down Expand Up @@ -900,7 +946,7 @@ func (c *Client) CallAWSTagCreate(occmDetails createOCCMDetails) error {
}

// CallAWSTagDelete deletes tag
func (c *Client) CallAWSTagDelete(occmDetails createOCCMDetails) error {
func (c *Client) CallAWSTagDelete(occmDetails createAWSOCCMDetails) error {

var sess *session.Session
if c.AWSProfile != "" {
Expand Down Expand Up @@ -946,7 +992,7 @@ func (c *Client) CallAWSTagDelete(occmDetails createOCCMDetails) error {
}

// CallAWSDescribeInstanceAttribute returns disableAPITermination.
func (c *Client) CallAWSDescribeInstanceAttribute(occmDetails createOCCMDetails) (bool, error) {
func (c *Client) CallAWSDescribeInstanceAttribute(occmDetails createAWSOCCMDetails) (bool, error) {

var sess *session.Session
if c.AWSProfile != "" {
Expand Down
163 changes: 137 additions & 26 deletions cloudmanager/occm_aws.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,56 @@ type createOCCMDetails struct {
Labels map[string]string
}

// Each Connector should have its own struct as each cloud provider has different fields
// createAWSOCCMDetails the users input for creating a occm
type createAWSOCCMDetails struct {
Name string
GCPProject string
Company string
InstanceID string
Region string
Location string
Zone string
AMI string
KeyName string
InstanceType string
IamInstanceProfileName string
SecurityGroupID string
SubnetID string
NetworkProjectID string
ProxyURL string
ProxyUserName string
ProxyPassword string
ResourceGroup string
SubscriptionID string
MachineType string
ServiceAccountEmail string
GCPCommonSuffixName string
VnetID string
VnetResourceGroup string
AdminUsername string
AdminPassword string
VirtualMachineSize string
NetworkSecurityGroupName string
NetworkSecurityResourceGroup string
AssociatePublicIPAddress *bool
AssociatePublicIP bool
FirewallTags bool
EnableTerminationProtection *bool
AwsTags []userTags
Tags []string
StorageAccount string
Labels map[string]string
InstanceMetadata AWSInstanceMetadata
}

// AWSInstanceMetadata describes the metadata options for the ec2 instance
type AWSInstanceMetadata struct {
HTTPEndpoint *string
HTTPPutResponseHopLimit *int64
HTTPTokens *string
}

// deleteOCCMDetails the users input for deleting a occm
type deleteOCCMDetails struct {
InstanceID string
Expand Down Expand Up @@ -338,7 +388,7 @@ func (c *Client) createAccount(clientID string) (string, error) {
return result.AccountID, nil
}

func (c *Client) createAWSInstance(occmDetails createOCCMDetails, clientID string) (string, error) {
func (c *Client) createAWSInstance(occmDetails createAWSOCCMDetails, clientID string) (string, error) {

instanceID, err := c.CallAWSInstanceCreate(occmDetails)
if err != nil {
Expand Down Expand Up @@ -369,12 +419,12 @@ func (c *Client) createAWSInstance(occmDetails createOCCMDetails, clientID strin
return instanceID, nil
}

func (c *Client) getAWSInstance(occmDetails createOCCMDetails, id string) (ec2.Instance, error) {
func (c *Client) getAWSInstance(occmDetails createAWSOCCMDetails, id string) (ec2.Instance, error) {

log.Print("getAWSInstance")

res, err := c.CallAWSInstanceGet(occmDetails)
returnOCCM := createOCCMDetails{}
returnOCCM := createAWSOCCMDetails{}
if err != nil {
return ec2.Instance{}, err
}
Expand All @@ -384,13 +434,65 @@ func (c *Client) getAWSInstance(occmDetails createOCCMDetails, id string) (ec2.I
returnOCCM.AMI = *instance.ImageId
returnOCCM.InstanceID = *instance.InstanceId
returnOCCM.InstanceType = *instance.InstanceType
returnOCCM.InstanceMetadata = AWSInstanceMetadata{
HTTPEndpoint: instance.MetadataOptions.HttpEndpoint,
HTTPPutResponseHopLimit: instance.MetadataOptions.HttpPutResponseHopLimit,
HTTPTokens: instance.MetadataOptions.HttpTokens,
}
return instance, nil
}
}
return ec2.Instance{}, nil
}

func (c *Client) createOCCM(occmDetails createOCCMDetails, proxyCertificates []string, clientID string) (OCCMMResult, error) {
// TODO: move this general function out of this file, As it is sepefic to AWS
func (c *Client) createOCCM(occmDetails createAWSOCCMDetails, proxyCertificates []string, clientID string) (OCCMMResult, error) {
log.Printf("createOCCM %s %s", occmDetails.Name, clientID)
if occmDetails.AMI == "" {

ami, err := c.CallAMIGet(occmDetails)
if err != nil {
return OCCMMResult{}, err
}
occmDetails.AMI = ami
}

var registerAgentTOService registerAgentTOServiceRequest
registerAgentTOService.Name = occmDetails.Name
registerAgentTOService.Placement.Region = occmDetails.Region
registerAgentTOService.Placement.Subnet = occmDetails.SubnetID
registerAgentTOService.Company = occmDetails.Company
if occmDetails.ProxyURL != "" {
registerAgentTOService.Extra.Proxy.ProxyURL = occmDetails.ProxyURL
}

if occmDetails.ProxyUserName != "" {
registerAgentTOService.Extra.Proxy.ProxyUserName = occmDetails.ProxyUserName
}

if occmDetails.ProxyPassword != "" {
registerAgentTOService.Extra.Proxy.ProxyPassword = occmDetails.ProxyPassword
}

userData, newClientID, err := c.getUserData(registerAgentTOService, proxyCertificates, clientID)
if err != nil {
return OCCMMResult{}, err
}
c.UserData = userData
var result OCCMMResult
result.ClientID = newClientID
result.AccountID = c.AccountID
instanceID, err := c.createAWSInstance(occmDetails, newClientID)
if err != nil {
return OCCMMResult{}, err
}
result.InstanceID = instanceID

log.Printf("createOCCM clientID: %s, cclient=%s", result.ClientID, newClientID)
return result, nil
}

func (c *Client) createAWSOCCM(occmDetails createAWSOCCMDetails, proxyCertificates []string, clientID string) (OCCMMResult, error) {
log.Printf("createOCCM %s %s", occmDetails.Name, clientID)
if occmDetails.AMI == "" {

Expand Down Expand Up @@ -522,7 +624,7 @@ func (c *Client) deleteOCCM(request deleteOCCMDetails, clientID string) error {
}

// only tags can be updated. Other update functionalities to be added.
func (c *Client) updateOCCM(occmDetails createOCCMDetails, proxyCertificates []string, deleteTags []userTags, addModifyTags []userTags, clientID string) error {
func (c *Client) updateOCCM(occmDetails createAWSOCCMDetails, proxyCertificates []string, deleteTags []userTags, addModifyTags []userTags, clientID string, callAWSInstanceUpdate bool) error {

log.Print("updating OCCM")
if occmDetails.AMI == "" {
Expand All @@ -533,39 +635,48 @@ func (c *Client) updateOCCM(occmDetails createOCCMDetails, proxyCertificates []s
}
occmDetails.AMI = ami
}
//No documentation on the follwing code. It was working until the time instance update was added. The error is:
// code: 403, message: Action not allowed for user

var registerAgentTOService registerAgentTOServiceRequest
registerAgentTOService.Name = occmDetails.Name
registerAgentTOService.Placement.Region = occmDetails.Region
registerAgentTOService.Placement.Subnet = occmDetails.SubnetID
registerAgentTOService.Company = occmDetails.Company
if occmDetails.ProxyURL != "" {
registerAgentTOService.Extra.Proxy.ProxyURL = occmDetails.ProxyURL
}
// var registerAgentTOService registerAgentTOServiceRequest
// registerAgentTOService.Name = occmDetails.Name
// registerAgentTOService.Placement.Region = occmDetails.Region
// registerAgentTOService.Placement.Subnet = occmDetails.SubnetID
// registerAgentTOService.Company = occmDetails.Company
// if occmDetails.ProxyURL != "" {
// registerAgentTOService.Extra.Proxy.ProxyURL = occmDetails.ProxyURL
// }

if occmDetails.ProxyUserName != "" {
registerAgentTOService.Extra.Proxy.ProxyUserName = occmDetails.ProxyUserName
}
// if occmDetails.ProxyUserName != "" {
// registerAgentTOService.Extra.Proxy.ProxyUserName = occmDetails.ProxyUserName
// }

if occmDetails.ProxyPassword != "" {
registerAgentTOService.Extra.Proxy.ProxyPassword = occmDetails.ProxyPassword
}
// if occmDetails.ProxyPassword != "" {
// registerAgentTOService.Extra.Proxy.ProxyPassword = occmDetails.ProxyPassword
// }

// userData, _, err := c.getUserData(registerAgentTOService, proxyCertificates, clientID)
// if err != nil {
// return err
// }
// c.UserData = userData

userData, _, err := c.getUserData(registerAgentTOService, proxyCertificates, clientID)
if err != nil {
return err
}
c.UserData = userData
if len(addModifyTags) > 0 {
occmDetails.AwsTags = addModifyTags
err = c.CallAWSTagCreate(occmDetails)
err := c.CallAWSTagCreate(occmDetails)
if err != nil {
return err
}
}
if len(deleteTags) > 0 {
occmDetails.AwsTags = deleteTags
err = c.CallAWSTagDelete(occmDetails)
err := c.CallAWSTagDelete(occmDetails)
if err != nil {
return err
}
}
if callAWSInstanceUpdate {
err := c.CallAWSInstanceUpdate(occmDetails)
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit e2e6188

Please sign in to comment.