Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Event_to_sketch in api #692

Merged
merged 3 commits into from
Dec 5, 2018
Merged

Conversation

jaegeral
Copy link
Collaborator

#691

Not yet ready to merge, maybe @berggren has opinion on the PR

e.g. do we need a unit test as well?

google#691

Not yet ready to merge
@jaegeral jaegeral changed the title First shot on Add Event_to_sketch in api Oct 30, 2018
@jaegeral
Copy link
Collaborator Author

Ok there is still an issue seems the ID returned is not the id from the event. Not sure why

@jaegeral
Copy link
Collaborator Author

So the return json is:

{
  "meta": {}, 
  "objects": [
    {
      "color": "7C79F3", 
      "created_at": "Tue, 12 Jun 2018 08:27:56 -0000", 
      "deleted": null, 
      "description": "internal timeline for user-created events", 
      "id": 18, 
      "name": "sketch specific timeline", 
      "searchindex": {
        "created_at": "Tue, 12 Jun 2018 08:27:52 -0000", 
        "deleted": null, 
        "description": "internal timeline for user-created events", 
        "id": 17, 
        "index_name": "cd0f4c15c00417d44c7e47414598a23b", 
        "name": "sketch specific timeline", 
        "status": [
          {
            "created_at": "Wed, 31 Oct 2018 06:30:41 -0000", 
            "id": 145, 
            "status": "ready", 
            "updated_at": "Wed, 31 Oct 2018 06:30:41 -0000"
          }
        ], 
        "updated_at": "Tue, 12 Jun 2018 08:27:52 -0000"
      }, 
      "status": [
        {
          "created_at": "Tue, 12 Jun 2018 11:03:41 -0000", 
          "id": 17, 
          "status": "new", 
          "updated_at": "Tue, 12 Jun 2018 11:03:41 -0000"
        }
      ], 
      "updated_at": "Tue, 12 Jun 2018 08:27:56 -0000"
    }
  ]
}

@jaegeral
Copy link
Collaborator Author

jaegeral commented Nov 5, 2018

IMHO ready to merge

Copy link
Contributor

@berggren berggren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Just a small nit on the docstring. I'll merge when updated.

api_client/python/timesketch_api_client/client.py Outdated Show resolved Hide resolved
Co-Authored-By: deralexxx <deralexxx@users.noreply.github.com>
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

@jaegeral
Copy link
Collaborator Author

jaegeral commented Nov 6, 2018

@berggren you need to make a author consent as far as I can see.

Copy link
Contributor

@berggren berggren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@berggren
Copy link
Contributor

berggren commented Dec 5, 2018

CLS bot is broken. deralexxx has signed the CLA.

@berggren berggren merged commit 5ef9ae3 into google:master Dec 5, 2018
@berggren berggren deleted the add_event_to_api branch December 5, 2018 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants